summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-01-11 02:22:48 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2019-01-11 02:22:48 +1100
commit522dada206601e8884ecc09d0cfbd2294089deeb (patch)
tree655bda603502caa8de2a0cb858557dac7d5240e8 /synapse/__init__.py
parentMerge pull request #4342 from aaronraimist/new-virtualenv (diff)
parentMerge Synapse v0.34.1.1 (diff)
downloadsynapse-522dada206601e8884ecc09d0cfbd2294089deeb.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2935238fa2..d6a191ccc6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.34.1"
+__version__ = "0.34.1.1"