summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:42:58 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:42:58 +0000
commitd6e40e7cbd351fa24beb3f46025b1a018b02cc97 (patch)
treec3461a4abedfb28a984bb000d8de8ae3a64473da /synapse/federation
parentNewsfile (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-d6e40e7cbd351fa24beb3f46025b1a018b02cc97.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_async
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions