mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-02-24 21:58:02 +01:00
# 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 |
||
|---|---|---|
| .. | ||
| 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 | ||