summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-02 16:20:23 +0100
committerErik Johnston <erik@matrix.org>2017-10-02 16:20:23 +0100
commit90d70af269f930f7b76a612ea1946be1fc33a6db (patch)
treeacb44def7327c19932e1017ddd39ab067315c016 /synapse
parentMerge pull request #2480 from matrix-org/rav/federation_client_logging (diff)
parentMerge branch 'release-v0.23.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-90d70af269f930f7b76a612ea1946be1fc33a6db.tar.xz
Merge branch 'master' 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 ec83e6adb7..97d6c4094d 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.23.0-rc2"
+__version__ = "0.23.0"