Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

a0b3946f

Unverified Commit a0b3946f authored 6 years ago by Richard van der Hoff Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri

parents 3ff6f50e 2f7008d4

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/consent_config.py 7 additions, 4 deletions

synapse/config/consent_config.py
synapse/handlers/message.py 4 additions, 1 deletion

synapse/handlers/message.py
synapse/server_notices/consent_server_notices.py 39 additions, 2 deletions

synapse/server_notices/consent_server_notices.py
synapse/server_notices/server_notices_manager.py 5 additions, 1 deletion

synapse/server_notices/server_notices_manager.py

with 55 additions and 8 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