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 0bfc6cfe71 Merge branch 'master' into backbone ... Conflicts: .gitignore		12 years ago
..
App_Start	…
Content	Merge branch 'master' into backbone	12 years ago
Controllers	…
Fakes	…
FakesAssemblies	…
Filters	Mass edit is now Series Editor.	13 years ago
Helpers	…
Models	Allow sorting with articles (option)	12 years ago
Properties	…
Scripts	…
Views	Merge branch 'master' into backbone	12 years ago
Global.asax	…
Global.asax.cs	…
NzbDrone.Web.csproj	Merge branch 'master' into backbone	12 years ago
NzbDrone.Web.ncrunchproject	…
Web.Debug.config	…
Web.Release.config	…
Web.config	…
favicon.ico	…
log.config	Log file is off by default.	13 years ago
packages.config	…