Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8c98281b

Commit 8c98281b authored 6 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'release-v0.30.0' into develop

parents 96f07ceb 6abcb5d2

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 37 additions, 0 deletions

CHANGES.rst
docs/server_notices.md 6 additions, 3 deletions

docs/server_notices.md
synapse/__init__.py 1 addition, 1 deletion

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

synapse/config/consent_config.py
synapse/config/server_notices_config.py 12 additions, 3 deletions

synapse/config/server_notices_config.py
synapse/handlers/message.py 7 additions, 2 deletions

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 19 additions, 4 deletions

synapse/server_notices/server_notices_manager.py

with 128 additions and 19 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