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
..
SessionManager.cs	Merge branch 'master' into authenticationdb-efcore	2021-06-23 20:22:12 -04:00
SessionWebSocketListener.cs	Merge branch 'master' into authenticationdb-efcore	2021-06-18 18:56:10 -04:00
WebSocketController.cs	Fix some warnings	2021-05-28 14:33:54 +02:00