summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:52:39 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:52:39 +0000
commit74c1e16106fca0ec9126c3e218cd7763330c5cb0 (patch)
treeb6c8f4148e647e0f11f7125f140954d023ed84d6 /synapse/federation/federation_server.py
parentMake concurrently_execute work with async/await (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-74c1e16106fca0ec9126c3e218cd7763330c5cb0.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await
Diffstat (limited to 'synapse/federation/federation_server.py')
0 files changed, 0 insertions, 0 deletions