mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into luke/fix-rte-autocomplete-truncate

Browse source
This commit is contained in:
Luke Barnard 2017-07-05 13:45:06 +01:00
commit 65a160f24a
5 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/RoomDirectory.js
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