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
..
AuthenticationRequest.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
ISessionController.cs	Rewrite WebSocket handling code	2020-01-13 20:06:08 +01:00
ISessionManager.cs	Merge branch 'master' into userdb-efcore	2020-05-26 20:29:11 -04:00
SessionEventArgs.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
SessionInfo.cs	Merge branch 'master' into websocket	2020-05-02 00:54:04 +02:00