Bump version and changelog v0.21.0-rc2

2 files changed, 14 insertions, 1 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index 183586e8dd..babeaa0ded 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+Changes in synapse v0.21.0-rc2 (2017-05-08)
+===========================================
+
+Changes:
+
+* Always mark remotes as up if we receive a signed request from them (PR #2190)
+
+
+Bug fixes:
+
+* Fix bug where users got pushed for rooms they had muted (PR #2200)
+
+
 Changes in synapse v0.21.0-rc1 (2017-05-08)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 500739b9a0..d4ad23fa3d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.21.0-rc1"
+__version__ = "0.21.0-rc2"