summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-14 17:34:09 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-14 17:34:09 +0000
commitbf4fd1480652f2af1eb54326c5a3130ceb295a07 (patch)
tree7c015345c6d48b1ddd284a7c54c3ca7ec1219015 /synapse/__init__.py
parentMerge branch 'master' into develop (diff)
parentMerge branch 'release-v0.99.1' (diff)
downloadsynapse-bf4fd1480652f2af1eb54326c5a3130ceb295a07.tar.xz
Merge branch 'master' 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 f7bac0ea4e..2004375f98 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.1"
+__version__ = "0.99.1.1"