diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-09 11:38:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-09 11:38:13 +0000 |
commit | 484867d35dfc99314053c58020a562d29b68da68 (patch) | |
tree | b3075131453083b31b54a0eae8022a81065ca6df /docs/CAPTCHA_SETUP.rst | |
parent | clean up changelog (diff) | |
parent | Merge pull request #4362 from matrix-org/erikj/better_errors (diff) | |
download | synapse-484867d35dfc99314053c58020a562d29b68da68.tar.xz |
Merge branch 'develop' into release-v0.34.1
Diffstat (limited to 'docs/CAPTCHA_SETUP.rst')
0 files changed, 0 insertions, 0 deletions