mirror of https://github.com/lidarr/Lidarr
5bbe310af5
Conflicts: NzbDrone.Common/DiskProvider.cs NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs NzbDrone.Core/Providers/DiskScanProvider.cs NzbDrone.Core/Providers/DownloadProvider.cs |
||
---|---|---|
.. | ||
AddSeriesController.cs | ||
CommandController.cs | ||
DirectoryController.cs | ||
EpisodeController.cs | ||
HealthController.cs | ||
HistoryController.cs | ||
LogController.cs | ||
MissingController.cs | ||
NotificationController.cs | ||
SearchHistoryController.cs | ||
SeriesController.cs | ||
SettingsController.cs | ||
SharedController.cs | ||
SystemController.cs | ||
UpcomingController.cs | ||
UpdateController.cs |