sonarr-repo-only/NzbDrone.Web/Views/Shared
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
..
Error.cshtml Page banner is now used for browser title. 2011-12-09 21:08:11 -08:00
Footer.cshtml Updated page footer, submenu indicator. 2012-03-01 17:29:33 -08:00
FreeSpace.cshtml Free space widgets 2012-12-23 23:16:43 -08:00
NoSeriesBanner.cshtml Some new icons/ Submenu tweaks. 2012-02-25 08:35:27 -08:00
_Layout.cshtml Merge branch 'master' into backbone 2012-12-23 00:46:23 -08:00
_ReferenceLayout.cshtml Fixed autocomplete issues 2012-12-18 18:30:10 -08:00