mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
# 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 |
||
---|---|---|
.. | ||
CreateUserLoggingConfigFile.cs | ||
DisableTranscodingThrottling.cs | ||
MigrateActivityLogDb.cs | ||
MigrateUserDb.cs | ||
RemoveDuplicateExtras.cs |