summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-09-09 16:59:10 +0100
committerRichard van der Hoff <richard@matrix.org>2020-09-09 16:59:10 +0100
commit9df3a8a19fb8c9e387cec8f38f23c8dec34672fd (patch)
tree07586efb2d59c175469e8d8ded0c65a1edd4ef51 /synapse/__init__.py
parentMerge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixes (diff)
parentFix /notifications and pushers misbehaving because of unread counts (#8280) (diff)
downloadsynapse-9df3a8a19fb8c9e387cec8f38f23c8dec34672fd.tar.xz
Merge branch 'release-v1.20.0' into matrix-org-hotfixes
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 1282d19b3c..f4aca64be8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.19.1" +__version__ = "1.20.0rc1" 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