jellyfin/Jellyfin.Server.Implementations/Security
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
..
AuthenticationManager.cs Fix builds 2021-04-10 17:11:59 -04:00
AuthorizationContext.cs Merge branch 'master' into authenticationdb-efcore 2021-05-21 00:19:07 -04:00