summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-10 14:57:27 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-10 14:57:27 +0100
commitc31793a784059d3c90c1a81396fa832fa9efebac (patch)
tree63654adb84ea710c6de7d94216a137a536ec44c3 /changelog.d
parentlog *after* reloading log config (diff)
parentchangelog (diff)
downloadsynapse-c31793a784059d3c90c1a81396fa832fa9efebac.tar.xz
Merge branch 'rav/fix_linearizer_cancellation' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/3676.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3676.bugfix b/changelog.d/3676.bugfix
new file mode 100644
index 0000000000..7b23a2773a
--- /dev/null
+++ b/changelog.d/3676.bugfix
@@ -0,0 +1 @@
+Make the tests pass on Twisted < 18.7.0