Merge branch 'develop' into dbkr/group_userlist

2017-09-19 13:26:55 +01:00 · 2017-09-19 13:26:55 +01:00 · e9fb5712bd
commit e9fb5712bd
parent 3c3328c5f1 658285ebbf
51 changed files with 890 additions and 333 deletions
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@ -131,6 +131,9 @@ export default React.createClass({
                useCompactLayout: event.getContent().useCompactLayout,
            });
        }
+        if (event.getType() === "m.ignored_user_list") {
+            dis.dispatch({action: "ignore_state_changed"});
+        }
    },

    _onKeyDown: function(ev) {