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 383dfe302f Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core/Providers/MediaFileProvider.cs		14 years ago
..
App_GlobalResources	…
App_Readme	…
Content	…
Controllers	Merge branch 'master' of git://github.com/kayone/NzbDrone	14 years ago
Helpers	…
Models	Merge branch 'master' of git://github.com/kayone/NzbDrone	14 years ago
Properties	…
Scripts	…
Views	removed Season/SeasonProvider, updated dbBenchmark tests.	14 years ago
Global.asax	…
Global.asax.cs	…
NzbDrone.Web.csproj	Moved episodeCount logic to mediaFileProvider.	14 years ago
Web.Debug.config	…
Web.Release.config	…
Web.config	…
favicon.ico	…
log.config	…
packages.config	…