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-26 20:29:11 -04:00
2020-04-29 12:17:01 +03:00
2020-04-21 16:21:09 -04:00
2020-04-21 16:21:09 -04:00
2020-04-21 10:21:20 +02:00
2020-05-14 18:59:10 +01:00
2020-05-15 18:33:18 -07:00
2020-05-17 13:33:38 -04:00
2020-01-15 11:05:57 +01:00
2020-05-03 16:51:39 -04:00