summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrewm@element.io>2022-10-28 16:30:54 +0100
committerAndrew Morgan <andrewm@element.io>2022-10-28 16:30:54 +0100
commit453914b472ce2dd3a85a0d4fa2636c45f88bb960 (patch)
tree226e8e03aa02fba2b50a1325c38f5b6cef4995fa
parentMerge branch 'master' into develop (diff)
parentAdd a note that #14300 did not get a fix for 1.70.1 (#14318) (diff)
downloadsynapse-453914b472ce2dd3a85a0d4fa2636c45f88bb960.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c7845b0e38..d34fd09024 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,14 @@
 Synapse 1.70.1 (2022-10-28)
 ===========================
 
+This release fixes some regressions that were discovered in 1.70.0.
+
+[#14300](https://github.com/matrix-org/synapse/issues/14300)
+was previously reported to be a regression in 1.70.0 as well. However, we have
+since concluded that it was limited to the reporter and thus have not needed
+to include any fix for it in 1.70.1.
+
+
 Bugfixes
 --------