summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-06-15 15:52:24 +0100
committerErik Johnston <erik@matrix.org>2021-06-15 15:52:24 +0100
commitd09e24a52d2cdd062efd73bc28e4fe2cd9bbab5e (patch)
tree3f50913b8164d6b4f5d60d12d946c717c3421467
parentRemove support for unstable MSC1772 prefixes. (#10161) (diff)
parent 1.36.0 (diff)
downloadsynapse-d09e24a52d2cdd062efd73bc28e4fe2cd9bbab5e.tar.xz
Merge branch 'master' into develop
Diffstat (limited to '')
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index aeec4fa5fa..0f9798a4d3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.36.0 (2021-06-15)
+===========================
+
+No significant changes.
+
+
 Synapse 1.36.0rc2 (2021-06-11)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 084e878def..e640dadde9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.36.0) stable; urgency=medium
+
+  * New synapse release 1.36.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 15 Jun 2021 15:41:53 +0100
+
 matrix-synapse-py3 (1.35.1) stable; urgency=medium
 
   * New synapse release 1.35.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 407ba14a76..c3016fc6ed 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.36.0rc2"
+__version__ = "1.36.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