Sonarr/NzbDrone.Web/Controllers
Mark McDowall 6116fdb032 Merge branch 'season-ignore'
Conflicts:
	NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
	NzbDrone.Core/NzbDrone.Core.csproj
2012-02-21 23:45:46 -08:00
..
AddSeriesController.cs
CommandController.cs
DirectoryController.cs
EpisodeController.cs
HealthController.cs
HistoryController.cs
LogController.cs
MissingController.cs
NotificationController.cs
SeriesController.cs
SettingsController.cs
SharedController.cs
SystemController.cs
UpcomingController.cs
UpdateController.cs