summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-22 11:38:27 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-22 11:38:27 +0100
commitb898a5600ac360c2257775bb80a92344b367f054 (patch)
tree5de765d7934dc5afdf20e35ada2c07299bc150a0 /synapse
parentRoom Statistics (#4338) (diff)
parentupdate changelog (diff)
downloadsynapse-b898a5600ac360c2257775bb80a92344b367f054.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 bf9e810da6..42af03b53d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.4"
+__version__ = "0.99.5rc1"