Merge branch 'master' into develop

* master:
  Fix broken link in MSC1711 FAQ
  Update changelog to better expain password reset change (#5545)
This commit is contained in:
Andrew Morgan 2019-06-25 18:08:56 +01:00
commit 3eb8c7b0eb
3 changed files with 7 additions and 2 deletions

View file

@ -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