summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-06-08 15:47:11 +0100
committerNeil Johnson <neil@matrix.org>2018-06-08 15:47:11 +0100
commited5a0780a4c9d4a2da706b203c7c9d417046bc7b (patch)
tree877e0d2d71ad378590cdef238628abde1b3da296 /synapse
parentMerge pull request #3372 from matrix-org/rav/better_verification_logging (diff)
parentMerge tag 'v0.31.1' (diff)
downloadsynapse-ed5a0780a4c9d4a2da706b203c7c9d417046bc7b.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 ca113db434..78fc63aa49 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.31.0"
+__version__ = "0.31.1"