jellyfin-server/Emby.Dlna/Eventing
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
..
DlnaEventManager.cs Merge branch 'master' into event-rewrite-1 2020-08-24 20:04:13 -04:00
EventSubscription.cs fix SA1513/SA1516 2020-06-16 16:11:30 +12:00