Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -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	Fixed indentation	2020-05-15 14:33:36 -04:00
MigrateUserDb.cs	2nd half of changes	2020-05-13 00:00:57 -04:00
RemoveDuplicateExtras.cs	Do not run DELETE command if no extras are detected	2020-05-15 15:12:26 -04:00