You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		12 years ago
..
DataTables-NzbDrone/media	Upgraded nuget packages, Ninject 3, SignalR 5	12 years ago
Images	Added nzbx to UI	12 years ago
font	Added Font-Awesome	12 years ago
jQueryUI	Bootstrap loading profiles via ajax	12 years ago
themes/base	Upgraded nuget packages, Ninject 3, SignalR 5	12 years ago
ActionButton.css	…
Grid.css	Removed lineheight for grid row	12 years ago
IndexerSettings.css	Fixed Newznab add button	12 years ago
Menu.css	Free diskspace in UI	12 years ago
Messages.css	Font-awesomed InfoBox	12 years ago
NzbDrone.css	Free space widgets	12 years ago
Overrides.css	…
QualitySettings.css	Adding works!	12 years ago
SeriesEditor.css	Status and Sorting added to Series Editor	12 years ago
Settings.css	Remove AJAX tabs for settings pages	12 years ago
font-awesome-ie7.css	Added Font-Awesome	12 years ago
font-awesome.css	Added Font-Awesome	12 years ago
jquery.gritter.css	Removed extraneous icons	12 years ago