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-20 13:07:53 -04:00
2020-03-24 16:12:06 +01:00
2020-05-18 16:58:14 -05:00
2020-04-27 19:03:42 +03:00
2020-02-23 12:11:43 +01:00
2020-05-14 16:15:09 -07:00
2019-12-10 16:22:03 +01:00
2020-05-26 11:37:52 +02:00