mirror of https://github.com/jellyfin/jellyfin.git
# 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 |
||
---|---|---|
.. | ||
ApiKeyService.cs | ||
SessionInfoWebSocketListener.cs | ||
SessionService.cs |