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-03-05 16:22:15 +03:00
2020-03-19 22:02:08 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-14 17:13:45 -04:00
2020-05-09 12:37:39 +02:00
2020-05-12 22:10:35 -04:00
2020-02-23 12:11:43 +01:00