summary refs log tree commit diff
path: root/docs/README.rst
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
commit30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14 (patch)
tree3ed918908fb7e7572c6f2c6d7244262b365e4444 /docs/README.rst
parentinitial (diff)
parentMerge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff)
downloadsynapse-30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search
Diffstat (limited to 'docs/README.rst')
0 files changed, 0 insertions, 0 deletions