jellyfin/Jellyfin.Server
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
..
2021-04-17 11:37:55 +01:00
2020-09-03 21:39:50 -06:00
2021-06-18 17:06:38 -04:00
2021-06-14 06:44:55 -06:00
2021-05-24 10:48:01 +02:00