jellyfin/MediaBrowser.Model
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-02-23 12:11:43 +01:00
2020-06-03 11:54:01 +02:00
2020-06-16 15:12:48 -06:00
2020-08-03 20:32:45 +02:00
2020-08-13 17:05:55 -04:00
2020-08-09 14:08:56 +02:00
2020-06-16 16:11:30 +12:00
2020-06-26 08:41:21 -06:00
2020-07-04 11:54:25 -04:00
2020-08-21 07:24:44 -06:00
2020-06-22 15:35:53 +02:00
2020-06-16 16:11:30 +12:00