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-01-08 10:52:48 +09:00
2020-05-13 15:03:35 -04:00
2020-05-20 12:09:52 -04:00
2020-05-20 13:07:53 -04:00
2020-05-12 22:10:35 -04:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00
2020-05-15 17:20:07 -04:00
2019-11-25 11:55:24 +01:00
2020-04-05 12:07:43 -04:00
2020-05-15 17:20:07 -04:00
2020-04-05 12:26:11 -04:00
2020-05-26 11:37:52 +02:00
2020-05-14 21:16:43 +00:00
2020-05-20 13:07:53 -04:00
2020-04-05 17:58:39 -04:00
2020-05-15 17:20:07 -04:00
2019-11-25 11:55:24 +01:00
2020-04-05 17:58:39 -04:00
2019-11-25 11:55:24 +01:00
2019-11-25 11:55:24 +01:00
2020-04-05 14:44:14 -04:00
2020-05-20 13:07:53 -04:00
2019-01-17 20:24:39 +01:00
2019-10-29 17:55:16 +01:00
2020-04-15 11:05:32 +02:00
2019-11-25 11:55:24 +01:00
2020-04-05 12:45:01 -04:00
2019-11-25 11:55:24 +01:00
2020-04-21 16:21:09 -04:00
2020-04-11 19:33:36 +09:00
2019-11-25 11:55:24 +01:00
2020-04-05 12:07:43 -04:00
2020-04-05 23:12:25 -04:00
2019-01-13 21:37:13 +01:00
2020-05-20 13:07:53 -04:00
2020-04-05 12:45:01 -04:00
2020-05-12 22:10:35 -04:00
2020-05-26 20:29:11 -04:00
2020-04-05 17:58:39 -04:00