summary refs log tree commit diff
path: root/docs/federate.md
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-16 08:52:21 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-16 08:52:21 -0400
commitab165994dba29ae8730da28cbe8c60d6a904f234 (patch)
tree4fa5f1d17e0ed6f30e6d35899feda4fd242062cf /docs/federate.md
parentMerge branch 'erikj/fix_origin_check' into release-v1.20.0 (diff)
parent1.19.2 (diff)
downloadsynapse-ab165994dba29ae8730da28cbe8c60d6a904f234.tar.xz
Merge remote-tracking branch 'origin/master' into release-v1.20.0
Diffstat (limited to 'docs/federate.md')
0 files changed, 0 insertions, 0 deletions