3 commits

Author	SHA1	Message	Date
Richard van der Hoff	0cbb4808ed	Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback"" ... This reverts commit 0122ef1037.	2020-04-03 11:28:49 +01:00
Richard van der Hoff	0122ef1037	Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback" ... This was incorrectly merged to master. This reverts commit 319c41f573, reversing changes made to 229eb81498.	2020-04-03 11:17:39 +01:00
Brendan Abolivier	48b37f61ce	Changelog	2020-03-26 19:02:59 +01:00