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-10 12:01:45 +00:00
2020-08-10 12:01:45 +00:00
2020-08-10 12:01:45 +00:00
2020-08-20 17:45:40 +02:00
2020-06-13 23:37:41 +12:00
2020-08-10 12:01:45 +00:00
2020-08-21 11:50:45 -06:00
2020-08-16 17:25:14 -04:00
2020-01-15 11:05:57 +01:00
2020-05-03 16:51:39 -04:00