Mark McDowall 5bbe310af5 Merge branch 'xem' into 'master' ... Conflicts: NzbDrone.Common/DiskProvider.cs NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs NzbDrone.Core/Providers/DiskScanProvider.cs NzbDrone.Core/Providers/DownloadProvider.cs		2012-10-20 16:07:04 -07:00
..
App_Start	Fixed: History grid loads faster (lazy loaded)	2012-07-27 23:37:47 -07:00
Content	Remove AJAX tabs for settings pages	2012-10-14 17:50:01 -07:00
Controllers	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Filters	…
Helpers	Remove AJAX tabs for settings pages	2012-10-14 17:50:01 -07:00
Models	Merge remote-tracking branch 'origin/dynamic-jobs'	2012-10-19 08:39:07 -07:00
Properties	Fixed up tests	2012-09-10 23:35:25 -07:00
Scripts	Merge remote-tracking branch 'origin/dynamic-jobs'	2012-10-19 08:39:07 -07:00
Views	Merge remote-tracking branch 'origin/dynamic-jobs'	2012-10-19 08:39:07 -07:00
Global.asax	…
Global.asax.cs	Lowercase routes	2012-10-14 17:53:34 -07:00
NzbDrone.Web.csproj	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
NzbDrone.Web.ncrunchproject	…
Web.Debug.config	…
Web.Release.config	…
Web.config	Font-Awesomed Series/Index	2012-10-10 16:39:16 -07:00
favicon.ico	…
log.config	…
packages.config	Lowercase routes	2012-10-14 17:53:34 -07:00