summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-03-27 20:21:09 +0000
committerRichard van der Hoff <richard@matrix.org>2020-04-03 11:17:39 +0100
commit0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1 (patch)
treeffc1e7686812cc2ffc9df8e2a845e7f16587f3c0 /tox.ini
parentRevert "Improve the UX of the login fallback when using SSO (#7152)" (diff)
downloadsynapse-0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1.tar.xz
Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback"
This was incorrectly merged to master.

This reverts commit 319c41f573eb14a966367b60b2e6e93bf6b028d9, reversing
changes made to 229eb81498b0fe1da81e9b5b333a0285acde9446.
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions