Files
jellyfin/MediaBrowser.Controller
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-05-12 22:10:35 -04:00
2020-05-20 13:07:53 -04:00
2020-02-23 10:53:51 +01:00
2020-05-20 13:07:53 -04:00
2020-05-22 20:20:18 -04:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00
2019-01-13 21:37:13 +01:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -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-12 22:10:35 -04:00
2019-07-06 16:15:38 +02:00
2019-02-20 11:09:06 +01:00
2020-05-12 22:10:35 -04:00
2019-10-29 17:55:16 +01:00
2019-01-17 20:24:39 +01:00
2020-05-26 11:37:52 +02:00