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

2017-07-05 09:55:03 +00:00 · 2017-07-05 09:55:03 +00:00 · e128434acd
parent 9f05236503 60703bdcfc
commit e128434acd
1 changed files with 1 additions and 0 deletions
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@ -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