imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Michael Telatynski 2017-06-20 18:39:59 +01:00
commit 7f6a252bcb
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View file

@ -330,7 +330,7 @@ module.exports = React.createClass({
defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
});
}).catch((e) => {
console.error("Unable to load session", e);
console.error(`Error attempting to load session from token params: ${e}`);
return false;
}).then((loadedSession) => {
if (!loadedSession) {