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
..
ApiKeyService.cs	rename session folder	2020-02-06 00:47:50 +09:00
SessionInfoWebSocketListener.cs	Merge branch 'master' into websocket	2020-05-02 00:54:04 +02:00
SessionService.cs	Initial migration code	2020-05-12 22:10:35 -04:00