1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2025-01-17 10:45:49 +02:00
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
..
2012-10-10 14:56:23 -07:00
2012-12-22 11:44:47 -08:00
2011-07-27 23:30:06 -07:00
2012-10-10 14:56:23 -07:00
2012-10-10 14:56:23 -07:00
2012-10-11 13:31:55 -07:00
2012-12-07 08:10:08 -08:00
2012-10-11 10:25:31 -07:00
2012-12-22 21:35:36 -08:00
2012-10-11 19:18:23 -07:00
2012-12-23 23:16:43 -08:00
2012-12-10 20:39:35 -08:00