Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5e42e616

Commit 5e42e616 authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release-v1.20.0' into develop

parents efb6b662 14b5b48a

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/8342.bugfix 1 addition, 0 deletions

changelog.d/8342.bugfix
synapse/federation/federation_server.py 40 additions, 12 deletions

synapse/federation/federation_server.py
synapse/federation/transport/server.py 8 additions, 5 deletions

synapse/federation/transport/server.py
synapse/server.py 5 additions, 0 deletions

synapse/server.py

with 54 additions and 17 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