You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
AddDefaultPluginRepository.cs	…
AddPeopleQueryIndex.cs	…
CreateUserLoggingConfigFile.cs	…
DisableTranscodingThrottling.cs	Use GetEncodingOptions where possible	4 years ago
MigrateActivityLogDb.cs	…
MigrateDisplayPreferencesDb.cs	…
MigrateUserDb.cs	Merge branch 'master' into ef-cleanup	4 years ago
ReaddDefaultPluginRepository.cs	…
RemoveDownloadImagesInAdvance.cs	…
RemoveDuplicateExtras.cs	…