summary refs log tree commit diff
path: root/synapse/config/groups.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-28 10:04:54 +0100
committerErik Johnston <erik@matrix.org>2019-06-28 10:04:54 +0100
commit576b62a6a314ea3928f8717704bbd3aedbdd1f25 (patch)
treea9252a394dae4fc3839585a2abfeeee65593560a /synapse/config/groups.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentUpdate the TLS cipher string and provide configurability for TLS on outgoing ... (diff)
downloadsynapse-576b62a6a314ea3928f8717704bbd3aedbdd1f25.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/groups.py')
-rw-r--r--synapse/config/groups.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/groups.py b/synapse/config/groups.py

index d11f4d3b96..2a522b5f44 100644 --- a/synapse/config/groups.py +++ b/synapse/config/groups.py
@@ -21,7 +21,7 @@ class GroupsConfig(Config): self.enable_group_creation = config.get("enable_group_creation", False) self.group_creation_prefix = config.get("group_creation_prefix", "") - def default_config(self, **kwargs): + def generate_config_section(self, **kwargs): return """\ # Uncomment to allow non-server-admin users to create groups on this server #