Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		2021-03-14 10:19:35 -04:00
..
AddDefaultPluginRepository.cs	Allow migration to optionally run on fresh install	2020-07-20 07:45:24 -06:00
AddPeopleQueryIndex.cs	Suggestions from code review	2020-12-04 08:00:55 -07:00
CreateUserLoggingConfigFile.cs	Allow migration to optionally run on fresh install	2020-07-20 07:45:24 -06:00
DisableTranscodingThrottling.cs	Use GetEncodingOptions where possible	2021-02-21 02:58:30 +01:00
MigrateActivityLogDb.cs	Allow migration to optionally run on fresh install	2020-07-20 07:45:24 -06:00
MigrateDisplayPreferencesDb.cs	JsonSerializer deserialize from bytes where possible	2021-01-12 15:28:02 +01:00
MigrateUserDb.cs	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
ReaddDefaultPluginRepository.cs	revert changes.	2020-11-19 15:40:20 +00:00
RemoveDownloadImagesInAdvance.cs	Don't die if folder doesn't have id	2020-12-01 17:36:36 -07:00
RemoveDuplicateExtras.cs	Allow migration to optionally run on fresh install	2020-07-20 07:45:24 -06:00