Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

6c0dfd2e

Commit 6c0dfd2e authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into release-v1.26.0

parents 5b8ee181 fa50e4bf

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/9159.feature 1 addition, 0 deletions

changelog.d/9159.feature
docs/sample_config.yaml 17 additions, 14 deletions

docs/sample_config.yaml
synapse/api/urls.py 0 additions, 2 deletions

synapse/api/urls.py
synapse/config/_base.py 6 additions, 5 deletions

synapse/config/_base.py
synapse/config/emailconfig.py 0 additions, 8 deletions

synapse/config/emailconfig.py
synapse/config/oidc_config.py 0 additions, 2 deletions

synapse/config/oidc_config.py
synapse/config/registration.py 4 additions, 17 deletions

synapse/config/registration.py
synapse/config/saml2_config.py 0 additions, 2 deletions

synapse/config/saml2_config.py
synapse/config/server.py 15 additions, 9 deletions

synapse/config/server.py
synapse/config/sso.py 5 additions, 8 deletions

synapse/config/sso.py
synapse/handlers/identity.py 0 additions, 2 deletions

synapse/handlers/identity.py
synapse/rest/well_known.py 0 additions, 4 deletions

synapse/rest/well_known.py
tests/rest/test_well_known.py 0 additions, 9 deletions

tests/rest/test_well_known.py
tests/utils.py 0 additions, 1 deletion

tests/utils.py

with 48 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment