jellyfin-server/MediaBrowser.Controller/Devices
Patrick Barron a225f34796 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
2021-05-18 18:09:46 -04:00
..
IDeviceManager.cs Merge branch 'master' into authenticationdb-efcore 2021-05-18 18:09:46 -04:00