Merge branch 'develop' into luke/feature-flair

2017-09-18 14:46:50 +01:00
parent 3476cfca79 0958689d25
commit 26941e994f
50 changed files with 854 additions and 298 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) {