From d561367c18db3300804dee182e74b4a8fb7998e6 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 29 Jun 2021 21:39:30 +0100
Subject: [PATCH] 1.37.1rc1

---
 CHANGES.md               | 9 +++++++++
 changelog.d/10269.bugfix | 1 -
 changelog.d/10272.bugfix | 1 -
 synapse/__init__.py      | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/10269.bugfix
 delete mode 100644 changelog.d/10272.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index eac91ffe0..8de3bad90 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 3cefa0578..000000000
--- 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 3cefa0578..000000000
--- 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 090049261..2070724c3 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