From b8b898666e61a0151eb3c22653f5c5b3e2f47328 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 30 Jan 2019 16:31:07 +0000
Subject: [PATCH] v0.99.0rc2

---
 CHANGES.md              | 17 +++++++++++++++++
 changelog.d/4527.bugfix |  1 -
 changelog.d/4528.doc    |  1 -
 synapse/__init__.py     |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/4527.bugfix
 delete mode 100644 changelog.d/4528.doc

diff --git a/CHANGES.md b/CHANGES.md
index 1b51cbf530..e08b8771b8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,23 @@
+Synapse 0.99.0rc2 (2019-01-30)
+==============================
+
+Bugfixes
+--------
+
+- Fix bug when rejecting remote invites. ([\#4527](https://github.com/matrix-org/synapse/issues/4527))
+- Fix incorrect rendering of server capabilities. ([81b7e7eed](https://github.com/matrix-org/synapse/commit/81b7e7eed323f55d6550e7a270a9dc2c4c7b0fe0))
+
+Improved Documentation
+----------------------
+
+- Add documentation on enabling ACME support when upgrading to v0.99. ([\#4528](https://github.com/matrix-org/synapse/issues/4528))
+
+
 Synapse 0.99.0rc1 (2019-01-30)
 ==============================
 
+Synapse v0.99.x is a precursor to the upcoming Synapse v1.0 release. It contains foundational changes to room architecture and the federation security model necessary to support the upcoming r0 release of the Server to Server API.
+
 Features
 --------
 
diff --git a/changelog.d/4527.bugfix b/changelog.d/4527.bugfix
deleted file mode 100644
index 974d799b88..0000000000
--- a/changelog.d/4527.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug when rejecting remote invites
diff --git a/changelog.d/4528.doc b/changelog.d/4528.doc
deleted file mode 100644
index 432ef55aa6..0000000000
--- a/changelog.d/4528.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation on enabling ACME support when upgrading to v0.99.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 94d5f6e3b0..5da59aa924 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.0rc1"
+__version__ = "0.99.0rc2"