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-01-17 20:24:39 +01:00
2020-05-12 22:10:35 -04:00
2020-05-20 13:07:53 -04:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2020-05-20 13:07:53 -04:00
2020-04-01 19:05:41 +02:00
2019-01-13 21:01:16 +01: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
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-28 22:06:34 +01:00
2019-01-13 21:01:16 +01:00
2020-05-20 13:07:53 -04:00
2020-05-26 20:29:11 -04:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2020-03-24 16:12:06 +01:00
2020-05-20 13:07:53 -04:00
2019-01-13 21:01:16 +01:00
2020-03-03 23:07:10 +01:00
2019-01-13 21:01:16 +01:00
2019-02-15 19:33:10 +01:00
2019-01-13 21:01:16 +01:00