jellyfin-server/Emby.Dlna/Ssdp
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
..
DeviceDiscovery.cs Merge branch 'master' into event-rewrite-1 2020-08-24 20:04:13 -04:00
SsdpExtensions.cs Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00