Resolve merge conflicts

This commit is contained in:
IvanaH8
2021-04-16 17:20:22 +02:00
50 changed files with 1463 additions and 710 deletions

View File

@@ -91,6 +91,7 @@ JupyterHub's [OAuthenticator][] currently supports the following
popular services:
- Auth0
- Azure AD
- Bitbucket
- CILogon
- GitHub