Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

67b82f13

Commit 67b82f13 authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah

parents afeea319 7740eddd

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4514.misc 1 addition, 0 deletions

changelog.d/4514.misc
synapse/event_auth.py 8 additions, 4 deletions

synapse/event_auth.py
synapse/events/validator.py 3 additions, 2 deletions

synapse/events/validator.py
synapse/federation/federation_base.py 40 additions, 30 deletions

synapse/federation/federation_base.py
synapse/federation/federation_client.py 3 additions, 3 deletions

synapse/federation/federation_client.py
synapse/federation/federation_server.py 11 additions, 5 deletions

synapse/federation/federation_server.py
synapse/federation/transaction_queue.py 1 addition, 1 deletion

synapse/federation/transaction_queue.py
synapse/handlers/federation.py 8 additions, 0 deletions

synapse/handlers/federation.py
synapse/handlers/room_member.py 2 additions, 1 deletion

synapse/handlers/room_member.py

with 77 additions and 46 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