diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-29 13:49:44 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-29 13:49:44 +0100 |
| commit | 784aaa53dfcd25643088d9347e58b5a746f71f21 (patch) | |
| tree | d1209dc7994aaa650fc2a4765eb501c0fbfb66d7 /synapse/api | |
| parent | Add config for setting the recaptcha verify api endpoint, so we can test it i... (diff) | |
| parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
| download | synapse-784aaa53dfcd25643088d9347e58b5a746f71f21.tar.xz | |
Merge branch 'develop' into markjh/SYT-8-recaptcha
Conflicts: synapse/handlers/auth.py
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions