From 51fb884c52c9dfc59bbaf188a8ac5dc01028f108 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 19 Apr 2017 17:32:00 -0400
Subject: [PATCH 1/2] Fix the system requirements list in README.rst

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index b9c854ad4..c92546124 100644
--- a/README.rst
+++ b/README.rst
@@ -84,6 +84,7 @@ Synapse Installation
 Synapse is the reference python/twisted Matrix homeserver implementation.
 
 System requirements:
+
 - POSIX-compliant system (tested on Linux & OS X)
 - Python 2.7
 - At least 1GB of free RAM if you want to join large public rooms like #matrix:matrix.org

From a5425b2e5b28fb7167b2c885aef7213664b20b9a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 May 2017 13:53:48 +0100
Subject: [PATCH 2/2] Bump changelog and version

---
 CHANGES.rst         | 6 ++++++
 synapse/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 476d6fb6b..82247fa52 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in synapse v0.21.0 (2017-05-18)
+=======================================
+
+No changes since v0.21.0-rc3
+
+
 Changes in synapse v0.21.0-rc3 (2017-05-17)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c39dde913..2a40bab3f 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-rc3"
+__version__ = "0.21.0"