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
..
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-20 13:07:53 -04:00
2020-04-21 10:18:26 +02:00
2020-04-20 10:18:12 +02:00
2020-05-20 13:07:53 -04:00