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
..
2020-02-23 12:11:43 +01:00
2020-08-19 17:50:50 +02:00
2020-06-16 16:11:30 +12:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-08-19 17:50:50 +02:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-08-19 17:50:50 +02:00
2020-02-23 12:11:43 +01:00
2020-06-15 10:45:55 +12:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-08-19 17:50:50 +02:00
2020-02-23 12:11:43 +01:00