mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
AddDefaultPluginRepository.cs | ||
AddPeopleQueryIndex.cs | ||
CreateUserLoggingConfigFile.cs | ||
DisableTranscodingThrottling.cs | ||
MigrateActivityLogDb.cs | ||
MigrateDisplayPreferencesDb.cs | ||
MigrateUserDb.cs | ||
ReaddDefaultPluginRepository.cs | ||
RemoveDownloadImagesInAdvance.cs | ||
RemoveDuplicateExtras.cs |