sonarr-repo-only/NzbDrone.Web/Content
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
..
DataTables-NzbDrone/media Upgraded nuget packages, Ninject 3, SignalR 5 2012-11-03 11:23:47 -07:00
Images Added nzbx to UI 2012-12-22 11:44:47 -08:00
font Added Font-Awesome 2012-10-10 14:56:23 -07:00
jQueryUI Bootstrap loading profiles via ajax 2012-11-09 08:28:59 -08:00
themes/base Upgraded nuget packages, Ninject 3, SignalR 5 2012-11-03 11:23:47 -07:00
ActionButton.css some css tweaks to AddSeries 2011-07-27 23:30:06 -07:00
Grid.css Removed lineheight for grid row 2012-10-11 13:31:55 -07:00
IndexerSettings.css Fixed Newznab add button 2012-12-07 08:10:08 -08:00
Menu.css Free diskspace in UI 2012-12-22 21:35:36 -08:00
Messages.css Font-awesomed InfoBox 2012-10-11 19:18:23 -07:00
NzbDrone.css Free space widgets 2012-12-23 23:16:43 -08:00
Overrides.css Fix: Added loading spinner to all autocomplete lists, better list text color 2012-03-01 18:37:43 -08:00
QualitySettings.css Adding works! 2012-12-10 20:39:35 -08:00
SeriesEditor.css Status and Sorting added to Series Editor 2012-09-22 22:21:20 -07:00
Settings.css Remove AJAX tabs for settings pages 2012-10-14 17:50:01 -07:00
font-awesome-ie7.css Added Font-Awesome 2012-10-10 14:56:23 -07:00
font-awesome.css Added Font-Awesome 2012-10-10 14:56:23 -07:00
jquery.gritter.css Removed extraneous icons 2012-10-11 10:25:31 -07:00