Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
69881c4455
1 changed files with 2 additions and 2 deletions
|
@ -92,10 +92,10 @@ module.exports = React.createClass({
|
||||||
<div className="mx_PinnedEventsPanel">
|
<div className="mx_PinnedEventsPanel">
|
||||||
<div className="mx_PinnedEventsPanel_body">
|
<div className="mx_PinnedEventsPanel_body">
|
||||||
<AccessibleButton className="mx_PinnedEventsPanel_cancel" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
|
<AccessibleButton className="mx_PinnedEventsPanel_cancel" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
|
||||||
<h3 className="mx_PinnedEventsPanel_header">{_t("Pinned Messages")}</h3>
|
<h3 className="mx_PinnedEventsPanel_header">{ _t("Pinned Messages") }</h3>
|
||||||
{ tiles }
|
{ tiles }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue