summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-06-22 13:03:44 +0100
committerMatthew Hodgson <matthew@matrix.org>2017-06-22 13:03:44 +0100
commitccfcef6b59a9ae4737297662a1ecd4a3251e20d2 (patch)
treec7e30a35b0b569725349ce8eba4d132dbc670f9c /synapse
parentAdd desc (diff)
parentMerge pull request #2282 from matrix-org/release-v0.21.1 (diff)
downloadsynapse-ccfcef6b59a9ae4737297662a1ecd4a3251e20d2.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2a40bab3f0..9df7d18993 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"
+__version__ = "0.21.1"