summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
commit73f1de31d107187949203ec8e3b3f248170b6316 (patch)
tree4d776766aa7e8122610725a20c1844df2860fd55 /synapse
parentremove urllib3 pin (#5230) (diff)
parent0.99.5.1 (diff)
downloadsynapse-73f1de31d107187949203ec8e3b3f248170b6316.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 d66d2411a1..4f95778eea 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.5"
+__version__ = "0.99.5.1"