summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
commit4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch)
tree43ac96a5b91bbc498228f44798cdc260de1f47c0 /synapse/config/appservice.py
parentApply the pusher http hack in the right place (#4692) (diff)
parentLogging improvements for the pusher (#4691) (diff)
downloadsynapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/appservice.py')
-rw-r--r--synapse/config/appservice.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py

index c21cb3dd87..c260d59464 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py
@@ -38,10 +38,12 @@ class AppServiceConfig(Config): def default_config(cls, **kwargs): return """\ # A list of application service config file to use + # app_service_config_files: [] # Whether or not to track application service IP addresses. Implicitly # enables MAU tracking for application service users. + # track_appservice_user_ips: False """