mirror of
https://github.com/element-hq/element-web
synced 2024-10-25 12:16:00 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
f76d9a7a97
1 changed files with 4 additions and 4 deletions
|
@ -299,12 +299,12 @@ module.exports = React.createClass({
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
|
||||||
} else if (room) {
|
} else if (room) {
|
||||||
// Stop peeking because we have joined this room previously
|
// Stop peeking because we have joined this room previously
|
||||||
MatrixClientPeg.get().stopPeeking();
|
MatrixClientPeg.get().stopPeeking();
|
||||||
this.setState({isPeeking: false});
|
this.setState({isPeeking: false});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_shouldShowApps: function(room) {
|
_shouldShowApps: function(room) {
|
||||||
|
|
Loading…
Reference in a new issue