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-14 17:03:53 -04:00
2020-03-03 23:07:10 +01:00
2020-05-15 18:33:18 -07:00
2020-02-23 12:11:43 +01:00
2020-05-19 21:45:48 -04:00
2020-05-20 13:07:53 -04:00
2020-02-23 12:11:43 +01:00
2020-05-20 13:07:53 -04:00
2020-05-12 22:10:35 -04: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
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00