summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-13 11:42:52 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-13 11:42:52 +0100
commit59e64b6d5b25734a07f5deb7e4996578b67d7273 (patch)
tree4cc73241dd547bcf02e6cfeb45928054b403ce95 /CHANGES.md
parentDo not use canonicaljson to magically handle decoding bytes from JSON. (#7802) (diff)
parent1.17.0 (diff)
downloadsynapse-59e64b6d5b25734a07f5deb7e4996578b67d7273.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md10
1 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index e6e575e5e4..6d4bd23e4e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,13 @@
+Synapse 1.17.0 (2020-07-13)
+===========================
+
+Synapse 1.17.0 is identical to 1.17.0rc1, with the addition of the fix that was included in 1.16.1.
+
+
 Synapse 1.16.1 (2020-07-10)
 ===========================
 
-In some distributions of Synapse 1.16.0, we incorrectly included a database
-migration which added a new, unused table. This release removes the redundant
-table.
+In some distributions of Synapse 1.16.0, we incorrectly included a database migration which added a new, unused table. This release removes the redundant table.
 
 Bugfixes
 --------