summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
commitfe6ab0439d4fabf166fa74def4ebbf9a9db054b6 (patch)
tree90a5a82c909bacc82b010056c59458d29e755a6f /synapse
parentMerge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1' (diff)
parentv1.11.1 (diff)
downloadsynapse-fe6ab0439d4fabf166fa74def4ebbf9a9db054b6.tar.xz
Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1'
v1.11.1

See merge request new-vector/synapse!6
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 3406ce634f..e56ba89ff4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.11.0"
+__version__ = "1.11.1"
 
 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