Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab

2020-06-01 14:32:31 +01:00 · 2020-06-01 14:32:31 +01:00 · 69747b6114
commit 69747b6114
parent 9e9bcb4974 419857c29c
55 changed files with 902 additions and 870 deletions
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@ -539,6 +539,7 @@ export const MsisdnAuthEntry = createReactClass({
                    type: MsisdnAuthEntry.LOGIN_TYPE,
                    // TODO: Remove `threepid_creds` once servers support proper UIA
                    // See https://github.com/vector-im/riot-web/issues/10312
+                    // See https://github.com/matrix-org/matrix-doc/issues/2220
                    threepid_creds: creds,
                    threepidCreds: creds,
                });