summary refs log tree commit diff
path: root/changelog.d/3874.bugfix
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
commit38ead946a9571f1916228c3d96aad48b6b57ef89 (patch)
treecdc68014a0368b266796c83f78b9a02e41c0fe07 /changelog.d/3874.bugfix
parenttowncrier (diff)
parentMerge pull request #3879 from matrix-org/matthew/fix-autojoin (diff)
downloadsynapse-38ead946a9571f1916228c3d96aad48b6b57ef89.tar.xz
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
Diffstat (limited to 'changelog.d/3874.bugfix')
-rw-r--r--changelog.d/3874.bugfix0
1 files changed, 0 insertions, 0 deletions
diff --git a/changelog.d/3874.bugfix b/changelog.d/3874.bugfix
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/changelog.d/3874.bugfix