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
..
FirstTimeSetupOrElevatedPolicy	Update Jellyfin.Api/Auth/FirstTimeSetupOrElevatedPolicy/FirstTimeSetupOrElevatedRequirement.cs	2019-11-26 10:20:45 +01:00
RequiresElevationPolicy	Fix more review comments	2019-11-24 19:25:46 +01:00
CustomAuthenticationHandler.cs	Merge branch 'master' into userdb-efcore	2020-05-26 20:29:11 -04:00