Patrick Barron be88efce3c Merge branch 'master' into authenticationdb-efcore ...

# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs

2021-06-18 18:56:10 -04:00

..

SessionManager.cs

Merge branch 'master' into authenticationdb-efcore

2021-06-18 18:56:10 -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