1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00

Merge branch 'develop' into dbkr/group_userlist

This commit is contained in:
Luke Barnard
2017-09-19 13:26:55 +01:00
51 changed files with 890 additions and 333 deletions

View File

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