summary refs log tree commit diff
path: root/docs/federate.md
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-06-25 18:08:56 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-06-25 18:08:56 +0100
commit3eb8c7b0eb48899a8329b18dd430ea9aa8b4e501 (patch)
tree2762d92b6afc623ee71fba8bce0c7ccdc856e856 /docs/federate.md
parentPrevent multiple upgrades on the same room at once (#5051) (diff)
parentMerge branch 'release-v1.0.0' (diff)
downloadsynapse-3eb8c7b0eb48899a8329b18dd430ea9aa8b4e501.tar.xz
Merge branch 'master' into develop
* master:
  Fix broken link in MSC1711 FAQ
  Update changelog to better expain password reset change (#5545)
Diffstat (limited to 'docs/federate.md')
0 files changed, 0 insertions, 0 deletions