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
..
Activity	Apply more review suggestions	2020-05-15 12:51:18 -04:00
Migrations	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
User	2nd half of changes	2020-05-13 00:00:57 -04:00
Jellyfin.Server.Implementations.csproj	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
JellyfinDb.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
JellyfinDbProvider.cs	Address review comments	2020-05-14 17:13:45 -04:00