Patrick Barron c1360a1dc3 Merge branch 'master' into userdb-efcore ... # 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		2020-05-12 22:22:20 -04:00
..
CreateUserLoggingConfigFile.cs	Use dependency injection to construct migration routines	2020-04-16 23:40:32 -04:00
DisableTranscodingThrottling.cs	Use dependency injection to construct migration routines	2020-04-16 23:40:32 -04:00
MigrateActivityLogDb.cs	Migrate activity db to EF Core	2020-05-02 18:32:22 -04:00
MigrateUserDb.cs	Initial migration code	2020-05-12 22:10:35 -04:00