jellyfin/Jellyfin.Api
Patrick Barron b6446c06ee Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2021-05-21 00:19:07 -04:00
..
2021-05-20 23:56:59 -04:00
2021-04-17 11:37:55 +01:00
2021-04-21 20:46:15 -06:00
2021-05-14 17:28:36 -06:00