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:24:11 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 14:24:11 +0100
commitd70f909e6c6a6789b2c24073991c909a1661d6ad (patch)
tree7637a4a4ba517e70cf8b533e358e285da177a0a3 /synapse/__init__.py
parentMerge commit '2983049a7' into anoa/dinsic_release_1_21_x (diff)
parent1.20.1 (diff)
downloadsynapse-d70f909e6c6a6789b2c24073991c909a1661d6ad.tar.xz
Merge commit '920dd1083' into anoa/dinsic_release_1_21_x
* commit '920dd1083':
  1.20.1
  Mark the shadow_banned column as boolean in synapse_port_db. (#8386)
  Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)
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 8242d05f60..e40b582bd5 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0" +__version__ = "1.20.1" 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