summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-04-06 13:28:54 +0100
committerErik Johnston <erik@matrix.org>2021-04-06 13:29:29 +0100
commit5688a74cf3042c0064e3600cb03f6edaa7f7c838 (patch)
treeb7dd5c333d6b6c45aa27fb79d5f67e51f3b86941 /synapse
parentAdd type hints to the federation handler and server. (#9743) (diff)
parent 1.31.0 (diff)
downloadsynapse-5688a74cf3042c0064e3600cb03f6edaa7f7c838.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 419299bf01..1d2883acf6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.31.0rc1"
+__version__ = "1.31.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when