summary refs log tree commit diff
path: root/changelog.d/4886.misc
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-04-01 14:08:53 +0100
committerNeil Johnson <neil@matrix.org>2019-04-01 14:08:53 +0100
commit62988f73fd6f005835996f2c2134b8c09a515575 (patch)
treec5d5310246c9f97e97dbffcd59482159a7ab7a81 /changelog.d/4886.misc
parentCollect room-version variations into one place (#4969) (diff)
parent0.99.3 (diff)
downloadsynapse-62988f73fd6f005835996f2c2134b8c09a515575.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/4886.misc')
-rw-r--r--changelog.d/4886.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/4886.misc b/changelog.d/4886.misc
deleted file mode 100644
index b17aa92485..0000000000
--- a/changelog.d/4886.misc
+++ /dev/null
@@ -1 +0,0 @@
-fix test_auto_create_auto_join_where_no_consent.