summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-06-06 12:28:15 +0100
committerNeil Johnson <neil@matrix.org>2018-06-06 12:28:15 +0100
commitfef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15 (patch)
tree16ea9194a2b4447c4a4dda0e8f209ddcedf12dfd /synapse
parentMerge pull request #3349 from t3chguy/redact_as_request_token (diff)
parentMerge tag 'v0.31.0' (diff)
downloadsynapse-fef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15.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 5bada5e290..ca113db434 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.30.0"
+__version__ = "0.31.0"