summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-25 14:52:46 +0100
committerErik Johnston <erik@matrix.org>2017-09-25 14:52:46 +0100
commit44edac049761dc8c848ea105444310efd3575171 (patch)
tree2454c8bb83c5f8fe1a7d7257ea6fb8d412bb2a54 /synapse
parentMerge pull request #2390 from r3dey3/develop (diff)
parentUpdate CHANGES (diff)
downloadsynapse-44edac049761dc8c848ea105444310efd3575171.tar.xz
Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse 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 dbf22eca00..30f78c11d1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.22.1"
+__version__ = "0.23.0-rc1"