summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
commitae5521be9cb9305501dde4670adc8afac67fa83c (patch)
tree6ee2474cfee583140c9d242916d0ddf11ab3f107 /synapse
parentNeilj/ensure get profileinfo available in client reader slaved store (#5213) (diff)
parent0.99.5 (diff)
downloadsynapse-ae5521be9cb9305501dde4670adc8afac67fa83c.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 42af03b53d..d66d2411a1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.5rc1"
+__version__ = "0.99.5"