kay.one c7a219ddc6 Merge branch 'markus101' ... Conflicts: NzbDrone.Web/NzbDrone.Web.csproj		2011-07-01 14:01:51 -07:00
..
AddSeriesController.cs	root dir is done	2011-07-01 13:59:25 -07:00
DirectoryController.cs	root dir is done	2011-07-01 13:59:25 -07:00
EpisodeController.cs	…
HealthController.cs	…
HistoryController.cs	…
LogController.cs	…
MissingController.cs	…
NotificationController.cs	…
SeriesController.cs	…
SettingsController.cs	Settings views all cleaned up.	2011-07-01 13:33:03 -07:00
SharedController.cs	…
StreamController.cs	…
SystemController.cs	…
UpcomingController.cs	…