mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-27 07:58:43 +02:00
# Conflicts: # Emby.Server.Implementations/Data/SqliteUserDataRepository.cs # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Entities/User.cs # Jellyfin.Data/ISavingChanges.cs # Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj # Jellyfin.Server.Implementations/JellyfinDb.cs # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Model/Notifications/NotificationOptions.cs # MediaBrowser.sln |
||
---|---|---|
.. | ||
Hls | ||
Progressive | ||
BaseStreamingService.cs | ||
MediaInfoService.cs | ||
StaticRemoteStreamWriter.cs | ||
StreamRequest.cs | ||
StreamState.cs | ||
TranscodingThrottler.cs | ||
UniversalAudioService.cs |