Merge branch 'release-v1.37' into develop
4 files changed, 10 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 0944371fec..f5ac026df5 100644
--- 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
deleted file mode 100644
index 3cefa05788..0000000000
--- a/changelog.d/10269.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
diff --git a/changelog.d/10272.bugfix b/changelog.d/10272.bugfix
deleted file mode 100644
index 3cefa05788..0000000000
--- a/changelog.d/10272.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 0900492619..2070724c34 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
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
|
