42b4f0aa2e
# Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
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 |