summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-09-24 17:00:33 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-09-24 17:00:33 +0100
commitc77c4a2fcdcbb6dd741325bb2e522bc93e4291e2 (patch)
treeab21a3d4e3d9156eb9d080707754de0ebd06fee1 /CHANGES.md
parentFix MultiWriteIdGenerator's handling of restarts. (#8374) (diff)
parents/URLs/variables in changelog (diff)
downloadsynapse-c77c4a2fcdcbb6dd741325bb2e522bc93e4291e2.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 84711de448..5de819ea1e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.20.1 (2020-09-24)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.20.0 which caused the `synapse_port_db` script to fail. ([\#8386](https://github.com/matrix-org/synapse/issues/8386))
+- Fix a bug introduced in v1.20.0 which caused variables to be incorrectly escaped in Jinja2 templates. ([\#8394](https://github.com/matrix-org/synapse/issues/8394))
+
+
 Synapse 1.20.0 (2020-09-22)
 ===========================