diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-25 18:08:56 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-25 18:08:56 +0100 |
commit | 3eb8c7b0eb48899a8329b18dd430ea9aa8b4e501 (patch) | |
tree | 2762d92b6afc623ee71fba8bce0c7ccdc856e856 /docs | |
parent | Prevent multiple upgrades on the same room at once (#5051) (diff) | |
parent | Merge branch 'release-v1.0.0' (diff) | |
download | synapse-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')
-rw-r--r-- | docs/MSC1711_certificates_FAQ.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/MSC1711_certificates_FAQ.md b/docs/MSC1711_certificates_FAQ.md index 7f9a23ff31..83497380df 100644 --- a/docs/MSC1711_certificates_FAQ.md +++ b/docs/MSC1711_certificates_FAQ.md @@ -14,7 +14,7 @@ upgraded, however it may be of use to those with old installs returning to the project. If you are setting up a server from scratch you almost certainly should look at -the [installation guide](INSTALL.md) instead. +the [installation guide](../INSTALL.md) instead. ## Introduction The goal of Synapse 0.99.0 is to act as a stepping stone to Synapse 1.0.0. It |