From f76f8c15679dbd70aeffa13bb4f2da7db2e59a6c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 22 Jul 2021 15:43:26 +0100
Subject: [PATCH]  1.39.0rc2

---
 CHANGES.md               | 15 +++++++++++++++
 changelog.d/10416.misc   |  1 -
 changelog.d/10457.bugfix |  1 -
 synapse/__init__.py      |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/10416.misc
 delete mode 100644 changelog.d/10457.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 066f798a9..a1dcbf6f5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.39.0rc2 (2021-07-22)
+==============================
+
+Bugfixes
+--------
+
+- Always include `device_one_time_keys_count` key in `/sync` response to work around a bug in Element Android that broke encryption for new devices. ([\#10457](https://github.com/matrix-org/synapse/issues/10457))
+
+
+Internal Changes
+----------------
+
+- Move docker image build to Github Actions. ([\#10416](https://github.com/matrix-org/synapse/issues/10416))
+
+
 Synapse 1.39.0rc1 (2021-07-20)
 ==============================
 
diff --git a/changelog.d/10416.misc b/changelog.d/10416.misc
deleted file mode 100644
index fa648372f..000000000
--- a/changelog.d/10416.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move docker image build to Github Actions.
diff --git a/changelog.d/10457.bugfix b/changelog.d/10457.bugfix
deleted file mode 100644
index ec950b584..000000000
--- a/changelog.d/10457.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Always include `device_one_time_keys_count` key in `/sync` response to work around a bug in Element Android that broke encryption for new devices.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 46902adab..01d6bf17f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.39.0rc1"
+__version__ = "1.39.0rc2"
 
 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