diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-03-11 21:12:30 +1100 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-03-11 21:12:30 +1100 |
commit | 30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14 (patch) | |
tree | 3ed918908fb7e7572c6f2c6d7244262b365e4444 /changelog.d | |
parent | initial (diff) | |
parent | Merge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff) | |
download | synapse-30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14.tar.xz |
Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/2090.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/4837.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/4839.misc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/2090.bugfix b/changelog.d/2090.bugfix new file mode 100644 index 0000000000..de2d22fcb8 --- /dev/null +++ b/changelog.d/2090.bugfix @@ -0,0 +1 @@ +Fix a bug where media with spaces in the name would get a corrupted name. diff --git a/changelog.d/4837.bugfix b/changelog.d/4837.bugfix new file mode 100644 index 0000000000..989aeb82bb --- /dev/null +++ b/changelog.d/4837.bugfix @@ -0,0 +1 @@ +Fix bug where synapse expected an un-specced `prev_state` field on state events. diff --git a/changelog.d/4839.misc b/changelog.d/4839.misc new file mode 100644 index 0000000000..7c6868051b --- /dev/null +++ b/changelog.d/4839.misc @@ -0,0 +1 @@ +Disable captcha registration by default in unit tests. \ No newline at end of file |