summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-08-09 19:23:47 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-08-09 19:23:47 +1000
commit984376745b655d7b755e267a89a5b57ddfd3cf8b (patch)
treeea59b71d17d43f3ca7cac94c071cbd162c3550fe /synapse
parentMerge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff)
parent0.33.2 changelog (diff)
downloadsynapse-984376745b655d7b755e267a89a5b57ddfd3cf8b.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 1810cb6fcd..a14d578e36 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -17,4 +17,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.33.1"
+__version__ = "0.33.2"