jellyfin/Emby.Server.Implementations
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-04-14 15:11:21 -04:00
2020-04-19 13:39:12 -04:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00
2020-05-14 17:13:45 -04:00
2020-05-20 10:04:00 -04:00
2020-05-20 13:07:53 -04:00
2020-02-23 12:11:43 +01:00
2020-05-15 18:33:18 -07:00
2020-04-01 19:05:41 +02:00
2020-05-02 01:09:35 +02:00
2020-03-24 16:12:06 +01:00
2020-05-20 13:07:53 -04:00
2020-01-22 22:20:35 +01:00
2020-04-20 10:18:12 +02:00
2020-05-20 13:07:53 -04:00
2020-05-26 11:37:52 +02:00
2020-05-20 13:07:53 -04:00
2020-04-11 20:10:16 +09:00