summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-21 14:12:58 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 14:12:58 +0100
commit3de9eb3529afad1ba181821c82940e73564039b4 (patch)
tree0999088b6c576fbcd50a2002303677afd78826c8 /synapse/__init__.py
parentMerge commit '43f2b67e4' into anoa/dinsic_release_1_21_x (diff)
parent1.20.0rc5 (diff)
downloadsynapse-3de9eb3529afad1ba181821c82940e73564039b4.tar.xz
Merge commit 'd5f7182ba' into anoa/dinsic_release_1_21_x
* commit 'd5f7182ba':
  1.20.0rc5
  1.19.3
  Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)
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 6b11c5681b..a95753dcc7 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0rc4" +__version__ = "1.20.0rc5" 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