summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-11-01 21:32:12 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2018-11-01 21:32:12 +1100
commit073d400b84f1f519b2295f7613bed4c39bbc7a21 (patch)
tree22cf9bbdb49ff952a8cb53367de5c512ecffa0b5 /synapse
parentMerge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff)
parentMerge branch 'release-v0.33.8' (diff)
downloadsynapse-073d400b84f1f519b2295f7613bed4c39bbc7a21.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 1ddbbbebfb..89ea9a9775 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.7"
+__version__ = "0.33.8"