Merge branch 'develop' into departify

2017-10-27 19:23:13 +02:00
parent 53e983f9c7 27083df0f9
commit 95b2392104
17 changed files with 202 additions and 60 deletions
@@ -174,7 +174,7 @@ module.exports = withMatrixClient(React.createClass({
            <div className="mx_MemberInfo">
                <GeminiScrollbar autoshow={true}>
                    <AccessibleButton className="mx_MemberInfo_cancel"onClick={this._onCancel}>
-                        <img src="img/cancel.svg" width="18" height="18" />
+                        <img src="img/cancel.svg" width="18" height="18" className="mx_filterFlipColor" />
                    </AccessibleButton>
                    <div className="mx_MemberInfo_avatar">
                        { avatar }