summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:12:50 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:12:50 +0100
commite80d7c398263d128bc9e18bdbce150c2249e3f47 (patch)
tree8e971e48afc9203670ee2054580fec7de3ffffda /synapse
parentMerge commit 'f76194a02' into anoa/dinsic_release_1_21_x (diff)
parent1.21.1 (diff)
downloadsynapse-e80d7c398263d128bc9e18bdbce150c2249e3f47.tar.xz
Merge commit '58e583eac' into anoa/dinsic_release_1_21_x
* commit '58e583eac':
  1.21.1
  Explicitly install test dependencies when building deb packages (#8523)
  Reverse proxies are not the only thing to change;be explicit w/ new endpoint
  Add deprecation warning for admin api under client api prefixes
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 57f818125a..722b53a67d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.0" +__version__ = "1.21.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