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 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		5 years ago
..
Jellyfin.Api.Tests	…
Jellyfin.Common.Tests	…
Jellyfin.Controller.Tests	…
Jellyfin.MediaEncoding.Tests	…
Jellyfin.Model.Tests	…
Jellyfin.Naming.Tests	…
Jellyfin.Server.Implementations.Tests	…
MediaBrowser.Api.Tests	…
coverletArgs.runsettings	…
jellyfin-tests.ruleset	…