diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-16 12:59:41 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-16 12:59:41 +0100 |
| commit | dd95eb4cb5f1519bfd328249f97f8731c4a11b64 (patch) | |
| tree | 96220dc54d2d6d0b36999c5c01db8d5f5b13b851 /synapse/config/password.py | |
| parent | add a url_preview_ip_range_whitelist config param so we can whitelist the mat... (diff) | |
| parent | fix logo (diff) | |
| download | synapse-dd95eb4cb5f1519bfd328249f97f8731c4a11b64.tar.xz | |
Merge branch 'develop' into matthew/preview_url_ip_whitelist
Diffstat (limited to 'synapse/config/password.py')
0 files changed, 0 insertions, 0 deletions