summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-06-07 13:04:20 +0100
committerErik Johnston <erik@matrix.org>2023-06-07 13:04:20 +0100
commit28423977be8637bab096ed32085f06e715abe51b (patch)
treeb1e5c1846406693a95644b93ff14b094e18807bd
parentFix schema delta error in 1.85 (#15739) (diff)
downloadsynapse-28423977be8637bab096ed32085f06e715abe51b.tar.xz
Update changelog
-rw-r--r--CHANGES.md2
-rw-r--r--changelog.d/15739.bugfix1
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 81bf3cc110..a0f9235cac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,7 @@ Synapse 1.85.1 (2023-06-07)
 Bugfixes
 --------
 
-- Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0. ([\#15738](https://github.com/matrix-org/synapse/issues/15738))
+- Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0. ([\#15738](https://github.com/matrix-org/synapse/issues/15738), [\#15739](https://github.com/matrix-org/synapse/issues/15739))
 
 
 Synapse 1.85.0 (2023-06-06)
diff --git a/changelog.d/15739.bugfix b/changelog.d/15739.bugfix
deleted file mode 100644
index 7129ab0782..0000000000
--- a/changelog.d/15739.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0.