diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
commit | f96b48067065b12654f60a7d8849eebeb5338a73 (patch) | |
tree | 1b9edd18e4e8c4f2218756b501292fde1fcb252e /docs/CAPTCHA_SETUP | |
parent | Start spliting out the rooms into joined and invited in v2 sync (diff) | |
parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
download | synapse-f96b48067065b12654f60a7d8849eebeb5338a73.tar.xz |
Merge branch 'develop' into markjh/v2_sync_api
Diffstat (limited to 'docs/CAPTCHA_SETUP')
0 files changed, 0 insertions, 0 deletions