summary refs log tree commit diff
path: root/synapse/config/api.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/api.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/api.py')
-rw-r--r--synapse/config/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/api.py b/synapse/config/api.py

index d9eff9ae1f..dddea79a8a 100644 --- a/synapse/config/api.py +++ b/synapse/config/api.py
@@ -30,7 +30,7 @@ class ApiConfig(Config): ], ) - def default_config(cls, **kwargs): + def generate_config_section(cls, **kwargs): return """\ ## API Configuration ##