matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Jorik Schellekens
2020-06-01 14:32:31 +01:00
parent 9e9bcb4974 419857c29c
commit 69747b6114
55 changed files with 902 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/auth/InteractiveAuthEntryComponents.js
View File

@@ -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,
});