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-24 20:04:13 -04:00
2020-08-20 12:16:24 +02:00
2020-08-19 18:02:34 +02:00
2020-04-01 19:05:41 +02:00
2020-06-05 18:15:56 -06:00
2020-08-24 20:04:13 -04:00
2020-08-13 13:11:30 -04:00
2020-06-16 10:37:52 +12:00