summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-06-28 20:56:07 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-06-28 20:56:07 +0100
commite72234f6bda33d89dcca07751e34c62b88215e9d (patch)
treed2c0917329ae8ccefef01e2af9561f59eeff66d1 /synapse/config
parentadd ip_range_whitelist parameter to limit where ASes can connect from (diff)
downloadsynapse-e72234f6bda33d89dcca07751e34c62b88215e9d.tar.xz
fix tests
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/appservice.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py

index 89c07f202f..0c27bb2fa7 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py
@@ -157,6 +157,7 @@ def _load_appservice(hostname, as_info, config_filename): config_filename, ) + ip_range_whitelist = None if as_info.get('ip_range_whitelist'): ip_range_whitelist = IPSet( as_info.get('ip_range_whitelist')