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
..
20200504195702_UserSchema.cs	Add the user data to the schema	2020-05-04 16:00:41 -04:00
20200504195702_UserSchema.Designer.cs	Add the user data to the schema	2020-05-04 16:00:41 -04:00
20200514181226_AddActivityLog.cs	Address review comments	2020-05-14 17:13:45 -04:00
20200514181226_AddActivityLog.Designer.cs	Address review comments	2020-05-14 17:13:45 -04:00
DesignTimeJellyfinDbFactory.cs	Apply more review suggestions	2020-05-15 12:51:18 -04:00
JellyfinDbModelSnapshot.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00