summary refs log tree commit diff
path: root/docs/federate.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-12-31 11:01:06 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-31 11:01:06 +0000
commitdc96943d514b18c47505271d7a6c2eeef7859dac (patch)
tree4d7a909fa49029a07d66c0c49f3af697a95b6682 /docs/federate.md
parentUpdate reverse proxy file name (#6590) (diff)
parent1.7.3 (diff)
downloadsynapse-dc96943d514b18c47505271d7a6c2eeef7859dac.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docs/federate.md')
0 files changed, 0 insertions, 0 deletions