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 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
Jellyfin.Api.Tests	Merge branch 'master' into userdb-efcore	4 years ago
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	…