Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8cfad2e6

Commit 8cfad2e6 authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking

parents fc5d9375 81d727ef

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/3568.feature
changelog.d/3689.bugfix 1 addition, 0 deletions

changelog.d/3689.bugfix
synapse/handlers/auth.py 2 additions, 2 deletions

synapse/handlers/auth.py
synapse/handlers/message.py 76 additions, 12 deletions

synapse/handlers/message.py
synapse/rest/client/v1/room.py 29 additions, 3 deletions

synapse/rest/client/v1/room.py
synapse/storage/events.py 1 addition, 1 deletion

synapse/storage/events.py
synapse/storage/state.py 64 additions, 2 deletions

synapse/storage/state.py
tests/handlers/test_auth.py 37 additions, 1 deletion

tests/handlers/test_auth.py
tests/handlers/test_register.py 19 additions, 1 deletion

tests/handlers/test_register.py
tests/storage/test_state.py 1 addition, 1 deletion

tests/storage/test_state.py

with 231 additions and 23 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