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:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-06-20 18:02:03 +02:00
2020-06-20 18:02:03 +02:00
2019-01-13 21:01:16 +01:00
2020-08-22 21:56:24 +02:00
2020-08-13 20:52:55 -04:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-06-16 10:37:52 +12:00
2020-08-22 21:56:24 +02:00
2020-08-22 21:56:24 +02:00
2020-06-16 10:37:52 +12:00