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
..
2019-08-09 22:36:20 +02:00
2020-05-12 22:10:35 -04:00
2020-05-02 00:54:04 +02:00
2019-01-13 21:01:16 +01:00
2020-05-20 13:07:53 -04:00
2019-01-13 21:01:16 +01: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-05-15 18:59:35 +02:00
2019-03-25 21:33:48 +01:00
2020-04-13 13:13:48 -04:00
2020-01-31 22:26:53 +01:00
2019-01-13 21:01:16 +01:00