diff options
author | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:30:16 -0500 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:30:16 -0500 |
commit | fa0f99e4f2ff3fdedf03f700b2c11004166f991f (patch) | |
tree | 8ae535542771484573b944785ec132b80b2a9cd5 /tests/utils.py | |
parent | Revert "block groups requests to fosdem" (diff) | |
parent | Clarify when new ratelimiting was added. (diff) | |
download | synapse-fa0f99e4f2ff3fdedf03f700b2c11004166f991f.tar.xz |
Merge branch 'release-v1.27.0' into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 68033d7535..840b657f82 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -159,6 +159,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": {}, |