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

Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases

Browse Source
This commit is contained in:
David Baker
2020-06-03 11:01:43 +01:00
parent 5844a2dd9b 936445ab2d
commit 6f3bfc96ca
43 changed files with 260 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/settings/CrossSigningPanel.js
View File

@@ -194,6 +194,8 @@ export default class CrossSigningPanel extends React.PureComponent {
</div>
);
}
// TODO: determine how better to expose this to users in addition to prompts at login/toast
let bootstrapButton;
if (
(!enabledForAccount || !crossSigningPublicKeysOnDevice) &&