diff options
| author | crobibero <cody@robibe.ro> | 2020-06-14 20:15:26 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-14 20:15:26 -0600 |
| commit | 589735f60ce36197be9d1c4609b0ee6e3fd3c291 (patch) | |
| tree | c5dad758fee4f4eb7727780fd7eab0fa60630a71 /MediaBrowser.Controller/Authentication | |
| parent | e2b2f74b47cc1d281c0819795b83f8d49d1f3b09 (diff) | |
| parent | f026a1d7217c69b4eeadd258980e254702f6dde6 (diff) | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'MediaBrowser.Controller/Authentication')
| -rw-r--r-- | MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Authentication/IPasswordResetProvider.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs b/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs index f5571065f..c0324a384 100644 --- a/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs +++ b/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using MediaBrowser.Controller.Entities; +using Jellyfin.Data.Entities; using MediaBrowser.Model.Users; namespace MediaBrowser.Controller.Authentication diff --git a/MediaBrowser.Controller/Authentication/IPasswordResetProvider.cs b/MediaBrowser.Controller/Authentication/IPasswordResetProvider.cs index 2639960e7..d9b814f69 100644 --- a/MediaBrowser.Controller/Authentication/IPasswordResetProvider.cs +++ b/MediaBrowser.Controller/Authentication/IPasswordResetProvider.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using MediaBrowser.Controller.Entities; +using Jellyfin.Data.Entities; using MediaBrowser.Model.Users; namespace MediaBrowser.Controller.Authentication |