PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik

Browse source
This commit is contained in:
Michael Telatynski 2017-05-27 20:59:35 +01:00
commit 45cd80dedb
22 changed files with 502 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Lifecycle.js
View file

@ -232,10 +232,8 @@ function _handleRestoreFailure(e) {
let msg = e.message;
if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
msg = _t(
'You need to log back in to generate end-to-end ' +
'encryption keys for this device and submit the public key to your homeserver. ' +
'This is a once off; sorry for the inconvenience'
) + '.';
'You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.'
);
_clearLocalStorage();