Merge branch 'master' into develop

2021-08-10 14:23:57 +01:00 · 2021-08-10 14:23:57 +01:00 · b5de77cf86
parent 7afb615839 9f7c038272
commit b5de77cf86
3 changed files with 13 additions and 1 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,9 @@
+Synapse 1.40.0 (2021-08-10)
+===========================
+
+No significant changes.
+
+
 Synapse 1.40.0rc3 (2021-08-09)
 ==============================

--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.40.0) stable; urgency=medium
+
+  * New synapse release 1.40.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 10 Aug 2021 13:50:48 +0100
+
 matrix-synapse-py3 (1.40.0~rc3) stable; urgency=medium

  * New synapse release 1.40.0~rc3.
--- a/synapse/init.py
+++ b/synapse/init.py
@ -47,7 +47,7 @@ try:
 except ImportError:
    pass

-__version__ = "1.40.0rc3"
+__version__ = "1.40.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