summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAzrenbeth <7782548+Azrenbeth@users.noreply.github.com>2021-09-07 17:19:32 +0100
committerAzrenbeth <7782548+Azrenbeth@users.noreply.github.com>2021-09-07 17:19:32 +0100
commit857b000996bd566eb9e17bac7fbe2369f295e202 (patch)
tree32e32b3d13f3e8ca1c3b85b0d724b05ce4cdf9c5 /synapse
parentUse attrs internally for the URL preview code & add documentation. (#10753) (diff)
parentAdd "No significant changes" to changelog (diff)
downloadsynapse-857b000996bd566eb9e17bac7fbe2369f295e202.tar.xz
Merge branch 'master' into develop
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 e4302d81a8..dc7ae24295 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.42.0rc2" +__version__ = "1.42.0" 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