diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:56:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:56:37 +0100 |
| commit | f33df307324e0134635430a1a2d9c7c45e68cbb5 (patch) | |
| tree | a0435aae03628d325a9b4ed82d0c74eb053afc61 | |
| parent | Merge pull request #2177 from matrix-org/erikj/faster_push_rules (diff) | |
| parent | Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-f33df307324e0134635430a1a2d9c7c45e68cbb5.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 6 | ||||
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 476d6fb6b4..82247fa528 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/README.rst b/README.rst index 9503ef510a..35141ac71b 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 diff --git a/synapse/__init__.py b/synapse/__init__.py index c39dde913f..2a40bab3f0 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" |