Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
..
2020-05-12 22:10:35 -04:00
2020-05-20 13:07:53 -04:00
2020-01-31 22:26:53 +01:00
2020-05-14 16:15:09 -07:00
2020-05-12 22:10:35 -04:00
2020-01-31 22:26:53 +01:00