diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
| commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
| tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /synapse/config/repository.py | |
| parent | Merge branch 'erikj/ldap3_auth' (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz | |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 8810079848..2c6f57168e 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -167,6 +167,8 @@ class ContentRepositoryConfig(Config): # - '10.0.0.0/8' # - '172.16.0.0/12' # - '192.168.0.0/16' + # - '100.64.0.0/10' + # - '169.254.0.0/16' # # List of IP address CIDR ranges that the URL preview spider is allowed # to access even if they are specified in url_preview_ip_range_blacklist. |