jellyfin/MediaBrowser.Controller/Session
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -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 Initial migration code 2020-05-12 22:10:35 -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