summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:29:09 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:29:09 -0700
commitcc8720e4af30b10ae084314d5420bb23cd1d6fa3 (patch)
treecd6406659f78b631ff368484298d6b9bf3ff5282 /synapse/__init__.py
parentMerge commit 'f299441cc' into anoa/dinsic_release_1_18_x (diff)
parentMerge branch 'master' into release-v1.17.0 (diff)
downloadsynapse-cc8720e4af30b10ae084314d5420bb23cd1d6fa3.tar.xz
Merge commit '8ccb7f08d' into anoa/dinsic_release_1_18_x
* commit '8ccb7f08d':
  update changelog
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 0116478fbb..5bb09a37d7 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.16.1" +__version__ = "1.17.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