summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-29 13:49:44 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-29 13:49:44 +0100
commit784aaa53dfcd25643088d9347e58b5a746f71f21 (patch)
treed1209dc7994aaa650fc2a4765eb501c0fbfb66d7 /tests
parentAdd config for setting the recaptcha verify api endpoint, so we can test it i... (diff)
parentSYN-395: Fix CAPTCHA, don't double decode json (diff)
downloadsynapse-784aaa53dfcd25643088d9347e58b5a746f71f21.tar.xz
Merge branch 'develop' into markjh/SYT-8-recaptcha
Conflicts:
	synapse/handlers/auth.py
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions