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		13 years ago
..
Contract	…
Model	…
NlogTargets	…
Properties	…
ConfigFileProvider.cs	…
ConsoleProvider.cs	…
DiskProvider.cs	Merge branch 'xem' into 'master'	13 years ago
EnvironmentProvider.cs	…
HttpProvider.cs	…
IISProvider.cs	…
LogConfiguration.cs	…
NzbDrone.Common.csproj	…
NzbDrone.Common.ncrunchproject	…
PathExtentions.cs	…
ProcessProvider.cs	…
ReportingService.cs	…
RestProvider.cs	…
SecurityProvider.cs	…
ServiceProvider.cs	…
StringExtention.cs	…
packages.config	…