summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-05-30 16:39:49 +0100
committerErik Johnston <erik@matrix.org>2019-05-30 16:39:49 +0100
commit99113e40ba4c5667a60ebcbf391ba9a840693576 (patch)
treef8376b9e7c7ee6e15049b85c39ac9e28bb4bbd75 /synapse
parentMerge pull request #5291 from matrix-org/erikj/add_index (diff)
parent0.99.5.2 (diff)
downloadsynapse-99113e40ba4c5667a60ebcbf391ba9a840693576.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 4f95778eea..d0e8d7c21b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.5.1"
+__version__ = "0.99.5.2"