summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-16 09:00:20 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-16 09:00:20 -0400
commit44dec6cbc4bdc4ad09bd6548631281b2d5ca3d7b (patch)
tree9523362d0773b544af3e3ccea20221a4f7476594 /synapse
parentMerge branch 'master' into develop (diff)
parent1.20.0rc4 (diff)
downloadsynapse-44dec6cbc4bdc4ad09bd6548631281b2d5ca3d7b.tar.xz
Merge tag 'v1.20.0rc4' into develop
Synapse 1.20.0rc4 (2020-09-16)
==============================

Synapse 1.20.0rc4 is identical to 1.20.0rc3, with the addition of the security fix that was included in 1.19.2.
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 bf0bf192a5..6b11c5681b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.20.0rc3"
+__version__ = "1.20.0rc4"
 
 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