mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-12 05:51:08 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e128434acd
1 changed files with 1 additions and 0 deletions
|
@ -73,6 +73,7 @@ module.exports = React.createClass({
|
|||
this.protocols = response;
|
||||
this.setState({protocolsLoading: false});
|
||||
}, (err) => {
|
||||
console.warn(`error loading thirdparty protocols: ${err}`);
|
||||
this.setState({protocolsLoading: false});
|
||||
if (MatrixClientPeg.get().isGuest()) {
|
||||
// Guests currently aren't allowed to use this API, so
|
||||
|
|
Loading…
Reference in a new issue