jellyfin/MediaBrowser.Model/Users
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
..
ForgotPasswordAction.cs Fix some warnings 2020-02-23 12:11:43 +01:00
ForgotPasswordResult.cs Fix some warnings 2020-02-23 12:11:43 +01:00
PinRedeemResult.cs Fix some warnings 2020-02-23 12:11:43 +01:00
UserAction.cs Fix some warnings 2020-02-23 12:11:43 +01:00
UserActionType.cs Fix some warnings 2020-02-23 12:11:43 +01:00
UserPolicy.cs Merge branch 'master' into userdb-efcore 2020-05-26 20:29:11 -04:00