summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 19:11:54 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 19:11:54 +0100
commit3e6a798ee777013d198830ad71a527f9c6e6cdf5 (patch)
tree1d777ee02594645add0c68544418813ba3e4d2cb /tests/utils.py
parentMerge commit 'fb0e14ee9' into anoa/dinsic_release_1_31_0 (diff)
parentBackout changes for automatically calculating the public baseurl. (#9313) (diff)
downloadsynapse-3e6a798ee777013d198830ad71a527f9c6e6cdf5.tar.xz
Merge commit 'e40d88cff' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index df8a463650..d76a46bc89 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -163,6 +163,7 @@ def default_config(name, parse=False): }, "rc_3pid_validation": {"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": {},