summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
commit1ffb7bec2090df16b66bb803a8540e5f20b1649d (patch)
tree8ffb1ee66a6a7008fb3cc8578f3ab1f3ed6c5af7 /synapse/__init__.py
parentMerge pull request #3556 from matrix-org/rav/background_processes (diff)
parentMerge pull request #3561 from matrix-org/rav/disable_logcontext_warning (diff)
downloadsynapse-1ffb7bec2090df16b66bb803a8540e5f20b1649d.tar.xz
Merge remote-tracking branch 'origin/release-v0.33.0' 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 3cde33c0d7..6dc16f0808 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.32.2"
+__version__ = "0.33.0rc1"