summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-08 14:06:35 +0000
committerErik Johnston <erik@matrix.org>2021-03-08 14:06:35 +0000
commitb988b07bb0d07d5d5f1323cc4d3282f5876b62f6 (patch)
treed0db1db9c73674283bbc329fc118655f7e9bca5e /CHANGES.md
parentCreate a SynapseReactor type which incorporates the necessary reactor interfa... (diff)
parentFixup changelog (diff)
downloadsynapse-b988b07bb0d07d5d5f1323cc4d3282f5876b62f6.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 15d2894bc6..99e314c68d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,15 @@
-Synapse 1.29.0rc1 (2021-03-04)
-==============================
+Synapse 1.29.0 (2021-03-08)
+===========================
 
 Note that synapse now expects an `X-Forwarded-Proto` header when used with a reverse proxy. Please see [UPGRADE.rst](UPGRADE.rst#upgrading-to-v1290) for more details on this change.
 
 
+No significant changes.
+
+
+Synapse 1.29.0rc1 (2021-03-04)
+==============================
+
 Features
 --------