summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
commit68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch)
tree8f71f2a3123fe30230d798259eca391794c52d48 /changelog.d
parentTypo in changelog (diff)
parentMerge pull request #4643 from matrix-org/erikj/catch_exceptions (diff)
downloadsynapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz
Merge branch 'develop' into babolivier/acme-delegated
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4643.misc1
-rw-r--r--changelog.d/4647.feature1
-rw-r--r--changelog.d/4657.misc1
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/4643.misc b/changelog.d/4643.misc
new file mode 100644
index 0000000000..556cdd2240
--- /dev/null
+++ b/changelog.d/4643.misc
@@ -0,0 +1 @@
+Reduce number of exceptions we log
diff --git a/changelog.d/4647.feature b/changelog.d/4647.feature
new file mode 100644
index 0000000000..5a5b1dcebb
--- /dev/null
+++ b/changelog.d/4647.feature
@@ -0,0 +1 @@
+Add configurable room list publishing rules
diff --git a/changelog.d/4657.misc b/changelog.d/4657.misc
new file mode 100644
index 0000000000..8872765819
--- /dev/null
+++ b/changelog.d/4657.misc
@@ -0,0 +1 @@
+Fix various spelling mistakes.