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-20 21:04:57 +02:00
2020-02-23 12:11:43 +01:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-24 20:04:13 -04:00
2019-04-03 22:58:52 -04:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-24 20:04:13 -04:00
2020-08-20 17:08:33 +02:00
2019-03-14 22:17:56 +01:00
2020-07-19 21:32:54 +02:00
2020-08-24 20:04:13 -04:00
2020-08-24 20:04:13 -04:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00
2020-08-13 15:47:31 -04:00
2020-08-13 15:47:31 -04:00
2020-08-24 20:04:13 -04:00
2020-08-13 15:47:31 -04:00
2020-02-23 12:11:43 +01:00