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-22 21:57:28 +02:00
2020-08-22 21:56:24 +02:00
2020-02-23 10:53:51 +01:00
2020-08-22 21:56:24 +02:00
2020-06-27 00:22:27 +09:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-23 00:26:32 +02:00
2020-08-15 23:20:41 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-24 20:04:13 -04:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2019-03-14 22:17:56 +01:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-24 20:04:13 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00