summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-25 02:54:59 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-25 02:54:59 +1000
commitfc691ca97ca171b81faef83e116a2c11a6816e1b (patch)
treecf1e8e3e66e7b1999bcd04a37838edac91538d86
parentbump version (diff)
downloadsynapse-fc691ca97ca171b81faef83e116a2c11a6816e1b.tar.xz
-rw-r--r--CHANGES.md10
-rw-r--r--changelog.d/3940.misc2
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md

index 58fb9acdda..45d3cdb131 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,13 @@ +Synapse 0.33.5.1 (2018-09-25) +============================= + +Internal Changes +---------------- + +- Fix incompatibility with older Twisted version in tests. Thanks + @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940)) + + Synapse 0.33.5 (2018-09-24) =========================== diff --git a/changelog.d/3940.misc b/changelog.d/3940.misc deleted file mode 100644
index a39d2bde3e..0000000000 --- a/changelog.d/3940.misc +++ /dev/null
@@ -1,2 +0,0 @@ -Fix incompatibility with older Twisted version in tests. Thanks -@OlegGirko!