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
..
2020-09-06 09:07:27 -06:00
2020-12-22 15:33:25 +00:00
2021-02-10 17:09:23 -07:00
2020-09-06 09:07:27 -06:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00