Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
CreateUserLoggingConfigFile.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	2020-05-29 11:28:19 +02:00
DisableTranscodingThrottling.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
MigrateActivityLogDb.cs	Use data binding instead of raw SQL	2020-06-04 14:54:43 -04:00
MigrateUserDb.cs	Fix bug when migrating user db with users that have never logged in.	2020-05-28 14:21:26 -04:00
RemoveDuplicateExtras.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00