summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-02-09 14:20:15 +0100
committerGitHub <noreply@github.com>2017-02-09 14:20:15 +0100
commit5c3cb8778af7265d277f5b42fc55660dbd8a3bc3 (patch)
tree89e85cf5a46dd3f01ad2919bc0c46769da1f9451 /scripts
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUpdate CAPTCHA_SETUP.rst X-Forwarded-For docs (diff)
downloadsynapse-5c3cb8778af7265d277f5b42fc55660dbd8a3bc3.tar.xz
Merge pull request #1896 from DanielDent/patch-1
Update CAPTCHA_SETUP.rst X-Forwarded-For docs
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions