diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-03-11 21:12:30 +1100 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-03-11 21:12:30 +1100 |
commit | 30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14 (patch) | |
tree | 3ed918908fb7e7572c6f2c6d7244262b365e4444 /synapse/config | |
parent | initial (diff) | |
parent | Merge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff) | |
download | synapse-30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14.tar.xz |
Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions