summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:24:35 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:24:35 +0100
commit50e257bea1aa58a424001b263ed442bf919e9710 (patch)
treefca1c2da05d2991beb704fb10d4cbd9cf95ea02d /tests/utils.py
parentMerge commit '72822e60b' into anoa/dinsic_release_1_31_0 (diff)
parentGive `public_baseurl` a default value (#9159) (diff)
downloadsynapse-50e257bea1aa58a424001b263ed442bf919e9710.tar.xz
Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0
Diffstat (limited to '')
-rw-r--r--tests/utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index a3b01575dd..96c33646e5 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -159,7 +159,6 @@ def default_config(name, parse=False): "remote": {"per_second": 10000, "burst_count": 10000}, }, "saml2_enabled": False, - "public_baseurl": None, "default_identity_server": None, "key_refresh_interval": 24 * 60 * 60 * 1000, "old_signing_keys": {},