summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-28 12:08:02 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-28 12:08:02 +0000
commit96562131a49d5a0b0e7e68f94f0884d23daaf8f3 (patch)
tree60704e66b8496e537ff833cd30002178673e4b00 /CHANGES.md
parentRemove local threepids on account deactivation (#6426) (diff)
parent1.6.1 (diff)
downloadsynapse-96562131a49d5a0b0e7e68f94f0884d23daaf8f3.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md15
1 files changed, 15 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 42281483b3..a9afd36d2c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.6.1 (2019-11-28)
+==========================
+
+Security updates
+----------------
+
+This release includes a security fix ([\#6426](https://github.com/matrix-org/synapse/issues/6426), below). Administrators are encouraged to upgrade as soon as possible.
+
+Bugfixes
+--------
+
+- Clean up local threepids from user on account deactivation. ([\#6426](https://github.com/matrix-org/synapse/issues/6426))
+- Fix startup error when http proxy is defined. ([\#6421](https://github.com/matrix-org/synapse/issues/6421))
+
+
 Synapse 1.6.0 (2019-11-26)
 ==========================