summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-25 03:10:01 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-25 03:10:01 +1000
commitfbe5ba25f6255db15a69687c0baa0b4ced64fec2 (patch)
tree0277c54551b40cd14402b43ad379346bc97e4780 /synapse
parentMerge branch 'master' into develop (diff)
parentMerge tag 'v0.33.5.1' (diff)
downloadsynapse-fbe5ba25f6255db15a69687c0baa0b4ced64fec2.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 58244a5dd4..b1f7a89fba 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.5"
+__version__ = "0.33.5.1"