You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		12 years ago
..
App_Start	Fixed: History grid loads faster (lazy loaded)	12 years ago
Content	Remove AJAX tabs for settings pages	12 years ago
Controllers	Merge branch 'xem' into 'master'	12 years ago
Filters	…
Helpers	Remove AJAX tabs for settings pages	12 years ago
Models	Merge remote-tracking branch 'origin/dynamic-jobs'	12 years ago
Properties	Fixed up tests	12 years ago
Scripts	Merge remote-tracking branch 'origin/dynamic-jobs'	12 years ago
Views	Merge remote-tracking branch 'origin/dynamic-jobs'	12 years ago
Global.asax	…
Global.asax.cs	Lowercase routes	12 years ago
NzbDrone.Web.csproj	Merge branch 'xem' into 'master'	12 years ago
NzbDrone.Web.ncrunchproject	…
Web.Debug.config	…
Web.Release.config	…
Web.config	Font-Awesomed Series/Index	12 years ago
favicon.ico	…
log.config	…
packages.config	Lowercase routes	12 years ago