summary refs log tree commit diff
path: root/changelog.d/4886.misc
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 11:43:46 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 11:43:46 +0000
commit45c4e19c74d8b3e05af221ffc5c81e04bd427fcc (patch)
tree6a6e9743f1c6926690c6e070abec0dbc5efc0fa7 /changelog.d/4886.misc
parentEnforce hs_disabled_message correctly (diff)
parentfix test_auto_create_auto_join_where_no_consent (#4886) (diff)
downloadsynapse-45c4e19c74d8b3e05af221ffc5c81e04bd427fcc.tar.xz
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'changelog.d/4886.misc')
-rw-r--r--changelog.d/4886.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/4886.misc b/changelog.d/4886.misc
new file mode 100644
index 0000000000..b17aa92485
--- /dev/null
+++ b/changelog.d/4886.misc
@@ -0,0 +1 @@
+fix test_auto_create_auto_join_where_no_consent.