1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-14 11:23:42 +02:00
Sonarr/NzbDrone.Core
Mark McDowall f3809d3a80 Merge branch 'master' into backbone
Conflicts:
	NzbDrone.Common/packages.config
	NzbDrone.Core.Test/packages.config
	NzbDrone.Core/NzbDrone.Core.csproj
	NzbDrone.Core/packages.config
	NzbDrone.Services/NzbDrone.Services.Service/packages.config
	NzbDrone.Web.UI.Test/NzbDrone.Web.UI.Automation.csproj
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/README_ENU.txt
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/msvcr90.dll
	NzbDrone.Web/_bin_deployableAssemblies/amd64/sqlceme40.dll
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/README_ENU.txt
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/msvcr90.dll
	NzbDrone.Web/_bin_deployableAssemblies/x86/sqlceme40.dll
	NzbDrone.Web/packages.config
2012-12-24 21:53:45 -08:00
..
Datastore Matching TvRage to TvDb 2012-12-19 08:41:51 -08:00
Helpers Merge remote-tracking branch 'origin/nzbx' 2012-12-23 01:09:40 -08:00
Instrumentation Fixed spelling of enviroment provider (Environment). :) 2012-03-06 18:59:43 -08:00
Jobs Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Model Backend work for nzbx.co 2012-12-21 00:35:20 -08:00
Properties Fixed up tests 2012-09-10 23:35:25 -07:00
Providers Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Repository Matching TvRage to TvDb 2012-12-19 08:41:51 -08:00
App.config Fixed post build steps 2012-12-24 19:46:52 -08:00
CentralDispatch.cs Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Constants.cs Post processor now deletes folders that are less than 40MB. 2011-10-24 22:15:20 -07:00
Fluent.cs Show free disk space in TB when applicable 2012-12-23 11:40:50 -08:00
GettingStarted.txt Updated twitterizer to 2.4.0.26532 2011-11-22 17:28:53 -08:00
Json.NET.license.txt Updated twitterizer to 2.4.0.26532 2011-11-22 17:28:53 -08:00
license.txt Added Growl (Not yet visible on the GUI). 2011-11-01 20:08:53 -07:00
NinjectDependencyResolver.cs Fixed ninject 2 reference 2012-12-10 23:52:30 -08:00
NzbDrone.Core.csproj Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
NzbDrone.Core.ncrunchproject Tests added 2012-07-12 11:30:43 -07:00
NzbDrone.ico Added Growl (Not yet visible on the GUI). 2011-11-01 20:08:53 -07:00
NzbDrone.jpg XbmcProvider updated to include new Json API methods. 2011-07-09 11:19:33 -07:00
packages.config Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Parser.cs CRO reporting for duty 2012-12-20 17:38:54 -08:00
WebTimer.cs Moved RenameSeriesJob to the Jobs folder. 2011-12-01 21:14:59 -08:00