summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-11-20 11:03:35 +0000
committerRichard van der Hoff <richard@matrix.org>2018-11-20 11:03:35 +0000
commit28e28a1974d89fc3cdf06cae36a3ebc16e2ff504 (patch)
treefebd9f48f5212fd0762f8f72bbbf28c954905fbe /tests/utils.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge remote-tracking branch 'origin/master' into develop (diff)
downloadsynapse-28e28a1974d89fc3cdf06cae36a3ebc16e2ff504.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
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 67ab916f30..52ab762010 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -134,6 +134,7 @@ def default_config(name): config.hs_disabled_limit_type = "" config.max_mau_value = 50 config.mau_trial_days = 0 + config.mau_stats_only = False config.mau_limits_reserved_threepids = [] config.admin_contact = None config.rc_messages_per_second = 10000