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 /scripts-dev/convert_server_keys.py | |
| 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 'scripts-dev/convert_server_keys.py')
0 files changed, 0 insertions, 0 deletions