Merge branch 'develop' into improved-forwarding-ui

2021-06-01 17:28:55 -04:00 · 2021-06-01 17:28:55 -04:00 · 56714525f2
commit 56714525f2
parent 5c7da97ff6 50994735d9
82 changed files with 4785 additions and 1386 deletions
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@ -133,7 +133,7 @@ describe('Login', function() {
        root.setState({
            flows: [{
                "type": "m.login.sso",
-                "org.matrix.msc2858.identity_providers": [{
+                "identity_providers": [{
                    id: "a",
                    name: "Provider 1",
                }, {