jellyfin/Jellyfin.Api
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
..
2019-11-24 19:25:46 +01:00
2020-06-09 14:04:25 -04:00
2020-06-11 07:13:56 -06:00