Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs		2020-05-26 20:29:11 -04:00
..
SessionManager.cs	Merge branch 'master' into userdb-efcore	2020-05-26 20:29:11 -04:00
SessionWebSocketListener.cs	Fix code issues	2020-05-26 11:37:52 +02:00
WebSocketController.cs	Make SonarCloud happy	2020-05-02 01:30:04 +02:00