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-03-25 10:53:03 -06:00
2020-02-23 12:11:43 +01:00
2020-03-24 16:12:06 +01:00
2020-04-01 18:10:29 +02:00
2020-02-04 01:49:27 +01:00
2020-05-20 12:09:52 -04:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +01:00
2020-02-04 01:49:27 +01:00
2020-05-18 00:06:07 +09:00
2020-02-04 01:49:27 +01:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +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-04 01:49:27 +01:00
2020-04-20 10:18:12 +02:00
2020-02-04 01:49:27 +01:00
2020-03-24 16:12:06 +01:00
2020-03-24 16:12:06 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00