Merge branch 'master' into develop
3 files changed, 14 insertions, 5 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
--------
diff --git a/debian/changelog b/debian/changelog
index 04cd0d0d68..3feefd8a1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-matrix-synapse-py3 (1.29.0) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.29.0) stable; urgency=medium
[ Jonathan de Jong ]
* Remove the python -B flag (don't generate bytecode) in scripts and documentation.
- -- Synapse Packaging team <packages@matrix.org> Fri, 26 Feb 2021 14:41:31 +0100
+ [ Synapse Packaging team ]
+ * New synapse release 1.29.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Mon, 08 Mar 2021 13:51:50 +0000
matrix-synapse-py3 (1.28.0) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2c24d4ae03..56ca888862 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.29.0rc1"
+__version__ = "1.29.0"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when
|
