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-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-04-01 19:05:41 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-08-24 20:04:13 -04:00
2020-08-19 17:50:50 +02:00
2020-06-26 10:12:22 -04:00
2020-08-19 17:50:50 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-08-19 18:57:47 +02:00
2019-03-14 22:17:56 +01:00
2020-08-19 17:50:50 +02:00
2020-08-09 14:08:55 +02:00
2020-08-21 22:01:19 +02:00
2020-06-19 20:24:13 +02:00
2020-06-19 20:24:13 +02:00
2020-08-17 11:46:40 -06:00