Merge branch 'master' of github.com:matrix-org/synapse into develop

2017-05-18 13:56:37 +01:00 · 2017-05-18 13:56:37 +01:00 · f33df30732
commit f33df30732
parent 6e381180ae 3accee1a8c
3 changed files with 8 additions and 1 deletions
--- 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)
 ===========================================

--- 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
--- 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"