You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
Activity	Apply more review suggestions	4 years ago
Migrations	Merge branch 'master' into userdb-efcore	4 years ago
User	2nd half of changes	4 years ago
Jellyfin.Server.Implementations.csproj	Merge branch 'master' into userdb-efcore	4 years ago
JellyfinDb.cs	Merge branch 'master' into userdb-efcore	4 years ago
JellyfinDbProvider.cs	Address review comments	4 years ago