Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

65a941d1

Commit 65a941d1 authored 5 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents e53744c7 b29474e0

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.buildkite/scripts/test_old_deps.sh 1 addition, 6 deletions

.buildkite/scripts/test_old_deps.sh
INSTALL.md 1 addition, 1 deletion

INSTALL.md
changelog.d/6910.bugfix 0 additions, 1 deletion

changelog.d/6910.bugfix
changelog.d/6995.misc 1 addition, 0 deletions

changelog.d/6995.misc
changelog.d/7015.misc 1 addition, 0 deletions

changelog.d/7015.misc
changelog.d/7018.bugfix 1 addition, 0 deletions

changelog.d/7018.bugfix
changelog.d/7019.misc 1 addition, 0 deletions

changelog.d/7019.misc
contrib/docker/docker-compose.yml 1 addition, 2 deletions

contrib/docker/docker-compose.yml
contrib/grafana/README.md 1 addition, 1 deletion

contrib/grafana/README.md
synapse/federation/federation_base.py 37 additions, 23 deletions

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

synapse/federation/federation_client.py
synapse/storage/data_stores/main/state_deltas.py 3 additions, 1 deletion

synapse/storage/data_stores/main/state_deltas.py
tox.ini 2 additions, 0 deletions

tox.ini

with 55 additions and 40 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