summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-03 14:58:14 +0100
committerErik Johnston <erik@matrix.org>2017-04-03 14:58:14 +0100
commit0d1c85e6432f2f736dd50e5520e684f8940c795b (patch)
treed1a31c46e9222fc193c141aa0b77e58a9fb57e6c /synapse
parentMerge pull request #2078 from APwhitehat/assertuserfriendly (diff)
parentBump version and changelog (diff)
downloadsynapse-0d1c85e6432f2f736dd50e5520e684f8940c795b.tar.xz
Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse 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 7628e7c505..580927abf4 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.19.3"
+__version__ = "0.20.0-rc1"