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

This commit is contained in:
Weblate 2017-07-05 09:55:03 +00:00
commit e128434acd

View File

@ -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