summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-16 10:36:29 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-16 10:36:29 +0100
commit789606577ade2335f19e944efcfecfe808519b36 (patch)
treec50b78ee8ba6227e0e7114b2c18802dd23f0516b /CHANGES.md
parentEnsure the body is a string before comparing push rules. (#7701) (diff)
parentFix changelog wording (diff)
downloadsynapse-789606577ade2335f19e944efcfecfe808519b36.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4a356442e3..9a30a2e901 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.15.1 (2020-06-16)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.15.0 that would crash Synapse on start when using certain password auth providers. ([\#7684](https://github.com/matrix-org/synapse/issues/7684))
+- Fix a bug introduced in v1.15.0 which meant that some 3PID management endpoints were not accessible on the correct URL. ([\#7685](https://github.com/matrix-org/synapse/issues/7685))
+
+
 Synapse 1.15.0 (2020-06-11)
 ===========================