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 67299f0d97 Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj		14 years ago
..
AddSeriesController.cs	Added Tests for CentralDispatch	14 years ago
DirectoryController.cs	…
EpisodeController.cs	…
HealthController.cs	…
HistoryController.cs	…
LogController.cs	…
MissingController.cs	…
NotificationController.cs	…
SeriesController.cs	Added Tests for CentralDispatch	14 years ago
SettingsController.cs	Merge branch 'master' of git://github.com/kayone/NzbDrone	14 years ago
SharedController.cs	…
StreamController.cs	…
SystemController.cs	Added Tests for CentralDispatch	14 years ago
UpcomingController.cs	…