summary refs log tree commit diff
path: root/synapse/replication/http/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
committerErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
commit431e485914b01eb1b245e37df814ff5bac110be1 (patch)
tree1262900b08616aa08768d9883349b11725218528 /synapse/replication/http/federation.py
parentNewsfile (diff)
parentFix quoting for allowed_local_3pids example config (#4476) (diff)
downloadsynapse-431e485914b01eb1b245e37df814ff5bac110be1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert
Diffstat (limited to 'synapse/replication/http/federation.py')
0 files changed, 0 insertions, 0 deletions