Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

74626a8d

Commit 74626a8d authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 93d07c87 55e0916f

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

scripts/federation_client.py 5 additions, 2 deletions

scripts/federation_client.py
synapse/federation/federation_base.py 28 additions, 13 deletions

synapse/federation/federation_base.py
synapse/federation/federation_server.py 6 additions, 3 deletions

synapse/federation/federation_server.py

with 39 additions and 18 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