Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021

2021-05-06 08:05:14 +01:00 · 2021-05-06 08:05:14 +01:00 · 90538c95aa
commit 90538c95aa
parent a7642b2b24 68210b1415
153 changed files with 2506 additions and 981 deletions
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@ -71,8 +71,8 @@ export default class ActionButton extends React.Component {
        }

        const icon = this.props.iconPath ?
-                (<TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />) :
-                undefined;
+            (<TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />) :
+            undefined;

        const classNames = ["mx_RoleButton"];
        if (this.props.className) {