summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-10-15 10:43:54 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-10-15 10:43:54 -0400
commit74976a8e43b9ab1d06b3142a8197dfb1e3626c6d (patch)
tree36411bd6c8fd337b08a56d963e2ce9cfeb6b24a6 /synapse/__init__.py
parentMerge branch 'release-v1.21.2' into develop (diff)
parentAdditional tweaks. (diff)
downloadsynapse-74976a8e43b9ab1d06b3142a8197dfb1e3626c6d.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 722b53a67d..83b8e4897f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.21.1"
+__version__ = "1.21.2"
 
 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