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
..
Datastore	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Helpers	Fixed: SABnzbd queue checking will not fail when items in queue are being repaired.	2012-05-19 13:07:30 -07:00
Instrumentation	Fixed spelling of enviroment provider (Environment). :)	2012-03-06 18:59:43 -08:00
Jobs	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Model	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Properties	Fixed up tests	2012-09-10 23:35:25 -07:00
Providers	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Repository	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
App.config	Updated Nuget packages.	2012-02-14 18:08:47 -08:00
CentralDispatch.cs	Added job for updating XEM mappings	2012-10-17 21:15:42 -07:00
Constants.cs	…
Fluent.cs	Added tests for null list in Min/Max or Default	2012-06-26 11:27:03 -07:00
GettingStarted.txt	…
Json.NET.license.txt	…
NzbDrone.Core.csproj	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
NzbDrone.Core.ncrunchproject	Tests added	2012-07-12 11:30:43 -07:00
NzbDrone.ico	…
NzbDrone.jpg	…
Parser.cs	Merge remote-tracking branch 'origin/master' into quality	2012-10-14 23:16:00 -07:00
WebTimer.cs	Moved RenameSeriesJob to the Jobs folder.	2011-12-01 21:14:59 -08:00
license.txt	…
packages.config	Updated nuget packages	2012-09-12 00:23:34 -07:00