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-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-04-01 19:05:41 +02:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-05-20 10:04:00 -04:00
2020-04-11 15:37:24 +02:00
2020-03-03 23:07:10 +01:00
2020-03-24 16:12:06 +01:00
2020-03-03 23:07:10 +01:00
2020-03-18 17:43:15 +09:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-05-25 18:25:45 +09:00
2019-03-14 22:17:56 +01:00
2020-03-03 23:07:10 +01:00
2020-04-04 15:12:02 -04:00
2020-05-22 23:46:45 -04:00
2020-03-18 17:43:15 +09:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-05-17 13:33:38 -04:00