summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-20 16:48:47 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-20 16:48:47 +0000
commit0b26feb42264e742968e2a573fa1390c667f41a8 (patch)
tree2b098ed5013ce06a5bb72e540d81d9dbe71a1442 /synapse
parentMerge pull request #4309 from KB1RD/KB1RD-fixes (diff)
parentClarify that py2 packages will continue to exist (diff)
downloadsynapse-0b26feb42264e742968e2a573fa1390c667f41a8.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 d5f6dc2094..27241cb364 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.34.0rc2"
+__version__ = "0.34.0"