summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-30 16:27:02 +0000
committerErik Johnston <erik@matrix.org>2020-10-30 16:27:02 +0000
commitf27a7896972d71af3ac21e82a81a64085fec32f1 (patch)
tree3562d5ce93b4f21c927a5229165b2aabe1605698 /synapse/__init__.py
parentMerge branch 'release-v1.22.1' into develop (diff)
parentFix changelog (diff)
downloadsynapse-f27a7896972d71af3ac21e82a81a64085fec32f1.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 35a82c0bfe..3e1df2b035 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.22.0"
+__version__ = "1.22.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