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/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@ -332,7 +332,7 @@ module.exports = React.createClass({
                        return;
                    }
                    memberList.push(
-                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} />
+                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />
                    );
                });
            }