jellyfin/Jellyfin.Server.Implementations/Security
Patrick Barron ae878fa051 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
2021-06-23 20:22:12 -04:00
..
AuthenticationManager.cs Re-add support for API keys 2021-06-18 18:26:58 -04:00
AuthorizationContext.cs Merge branch 'master' into authenticationdb-efcore 2021-06-23 20:22:12 -04:00