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-08-06 08:17:45 -06:00
2020-08-04 08:30:03 -06:00
2020-07-31 10:17:01 -06:00
2020-08-21 22:01:19 +02:00
2020-08-17 14:59:00 -06:00
2020-08-06 08:17:45 -06:00
2020-08-21 22:06:06 +02:00
2020-08-03 12:01:24 -06:00
2020-08-06 08:17:45 -06:00
2020-08-06 08:17:45 -06:00
2020-08-21 22:59:47 +02:00
2020-08-06 08:17:45 -06:00
2020-08-21 07:24:44 -06:00
2020-08-06 08:17:45 -06:00
2020-08-06 08:17:45 -06:00
2020-08-06 17:59:48 -06:00
2020-08-06 08:17:45 -06:00
2020-08-06 08:17:45 -06:00
2020-08-10 09:31:01 -06:00
2020-08-21 22:01:19 +02:00
2020-08-06 08:17:45 -06:00