Merge branch 'release-v1.37' into develop

matrix-org · Jun 29, 2021 · bc5589a · bc5589a
2 parents 785bcee + d561367
commit bc5589a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.37.1rc1 (2021-06-29)
+==============================
+
+Features
+--------
+
+- Handle inbound events from federation asynchronously. ([\#10269](https://github.com/matrix-org/synapse/issues/10269), [\#10272](https://github.com/matrix-org/synapse/issues/10272))
+
+
 Synapse 1.37.0 (2021-06-29)
 ===========================
 

diff --git a/changelog.d/10269.bugfix b/changelog.d/10269.bugfix
diff --git a/changelog.d/10272.bugfix b/changelog.d/10272.bugfix
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -47,7 +47,7 @@
 except ImportError:
     pass
 
-__version__ = "1.37.1a1"
+__version__ = "1.37.1rc1"
 
 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