summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-11 15:43:20 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-11 15:43:20 +0000
commitf208f608cbd7a203dd3d427508614083e438f2cc (patch)
tree6d983950a8f8fa9cddfe8cae5f78669ff14ca376 /synapse/__init__.py
parentAdd 'sandbox' to CSP for media repo (#4284) (diff)
parent0.34.0rc2 (diff)
downloadsynapse-f208f608cbd7a203dd3d427508614083e438f2cc.tar.xz
Merge branch 'release-v0.34.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 5a28fe2b82..d5f6dc2094 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.9"
+__version__ = "0.34.0rc2"