Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 ... # Conflicts: # Emby.Dlna/Emby.Dlna.csproj # Emby.Dlna/Eventing/DlnaEventManager.cs # Emby.Dlna/Service/BaseService.cs # Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs # MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs		2020-08-24 20:04:13 -04:00
..
DirectRecorder.cs	Enable Microsoft.CodeAnalysis.FxCopAnalyzers for Jellyfin.Common	2020-04-02 20:12:18 +02:00
EmbyTV.cs	Move GenericEventArgs to Jellyfin.Data.Events	2020-08-13 20:52:55 -04:00
EncodedRecorder.cs	Fix warnings	2020-08-19 17:50:50 +02:00
EntryPoint.cs	Make MediaBrowser.MediaEncoding warnings free	2020-08-20 12:16:24 +02:00
EpgChannelData.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
IRecorder.cs	Address comments	2020-04-01 19:05:41 +02:00
ItemDataProvider.cs	Address comments	2020-04-01 19:05:41 +02:00
NfoConfigurationExtensions.cs	Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs	2019-12-04 21:39:27 +01:00
RecordingHelper.cs	fix SA1510	2020-06-15 10:40:57 +12:00
SeriesTimerManager.cs	Address comments	2020-04-01 19:05:41 +02:00
TimerManager.cs	Move GenericEventArgs to Jellyfin.Data.Events	2020-08-13 20:52:55 -04:00