diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
| commit | b94a43d5b5a949fbd67109b34cfcec925fa82fe4 (patch) | |
| tree | 1e427071264b9cd23233175b3cff4684d93d6e36 /tests/utils.py | |
| parent | Use allow/deny (diff) | |
| parent | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin (diff) | |
| download | synapse-b94a43d5b5a949fbd67109b34cfcec925fa82fe4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
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 dd347a0c59..565bb60d08 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -124,6 +124,7 @@ def default_config(name): config.user_consent_server_notice_content = None config.block_events_without_consent_error = None config.media_storage_providers = [] + config.autocreate_auto_join_rooms = True config.auto_join_rooms = [] config.limit_usage_by_mau = False config.hs_disabled = False |