Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b5120f09

Commit b5120f09 authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

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

parents eee6fcf5 7447f197

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 1 addition, 1 deletion

CHANGES.md
changelog.d/9189.misc 1 addition, 0 deletions

changelog.d/9189.misc
docs/sample_config.yaml 9 additions, 4 deletions

docs/sample_config.yaml
synapse/config/oidc_config.py 24 additions, 4 deletions

synapse/config/oidc_config.py
tests/rest/client/v1/test_login.py 1 addition, 1 deletion

tests/rest/client/v1/test_login.py

with 36 additions and 10 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