summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
commit04eed80a73add90b5591fa5943648402dcd5bcaf (patch)
treea84f7bfee019b7ad0e79637bba015777ae663461 /synapse
parentMerge pull request #3927 from matrix-org/erikj/handle_background_errors (diff)
parentMerge tag 'v0.33.5' (diff)
downloadsynapse-04eed80a73add90b5591fa5943648402dcd5bcaf.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 9dbe0b9f10..58244a5dd4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.4"
+__version__ = "0.33.5"