summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-11 11:13:32 +0100
committerErik Johnston <erik@matrix.org>2017-04-11 11:13:32 +0100
commitf3cf3ff8b687e3ed699c1862f4fbc8be1f866f79 (patch)
tree3abc25d85a4ad7b00bc632c4d7c6e695957ad305 /synapse/__init__.py
parenttrust a hypothetical future riot.im IS (diff)
parentMerge branch 'release-v0.20.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 580927abf4..2e5f4e0ead 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.20.0-rc1"
+__version__ = "0.20.0"