diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:29:11 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:29:11 -0400 |
| commit | 01ce56016a3e7189cf29b22b095dc15b82a19303 (patch) | |
| tree | d627726db3424ac1ae3c47fde44644462a3e5a27 /MediaBrowser.Model/Configuration/UserConfiguration.cs | |
| parent | e052128c527672ed586a78257da1d2b07319e598 (diff) | |
| parent | 7c72f69189500ef491a0e81d8ce6788987f47fa3 (diff) | |
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
Diffstat (limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs')
0 files changed, 0 insertions, 0 deletions