summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorBen Banfield-Zanin <benbz@matrix.org>2020-09-29 17:16:55 +0100
committerBen Banfield-Zanin <benbz@matrix.org>2020-09-29 17:16:55 +0100
commit2506e36cf574d68fdb3059552f55ecda3ef62f20 (patch)
tree3767f4b7a394311f3776b26ad725952b08e0baca /tox.ini
parentMerge remote-tracking branch 'origin/anoa/info-mainline-no-check-password-res... (diff)
parentMake use of new argument to eliminate IS checks outside of registration (diff)
downloadsynapse-2506e36cf574d68fdb3059552f55ecda3ef62f20.tar.xz
Merge remote-tracking branch 'origin/anoa/3pid_check_invite_exemption' into bbz/info-mainline-1.20.1 github/bbz/info-mainline-1.20.1 bbz/info-mainline-1.20.1
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions