diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /changelog.d/6257.doc | |
parent | Format changelog (diff) | |
parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'changelog.d/6257.doc')
-rw-r--r-- | changelog.d/6257.doc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/6257.doc b/changelog.d/6257.doc deleted file mode 100644 index e985afde0e..0000000000 --- a/changelog.d/6257.doc +++ /dev/null @@ -1 +0,0 @@ -Modify CAPTCHA_SETUP.md to update the terms `private key` and `public key` to `secret key` and `site key` respectively. Contributed by Yash Jipkate. |