Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
This commit is contained in:
commit
09f9916916
293 changed files with 8602 additions and 3053 deletions
|
@ -77,8 +77,13 @@ export default class ReplyPreview extends React.Component {
|
|||
{ _t('Replying') }
|
||||
</div>
|
||||
<div className="mx_ReplyPreview_header mx_ReplyPreview_cancel">
|
||||
<img className="mx_filterFlipColor" src={require("../../../../res/img/cancel.svg")} width="18" height="18"
|
||||
onClick={cancelQuoting} />
|
||||
<img
|
||||
className="mx_filterFlipColor"
|
||||
src={require("../../../../res/img/cancel.svg")}
|
||||
width="18"
|
||||
height="18"
|
||||
onClick={cancelQuoting}
|
||||
/>
|
||||
</div>
|
||||
<div className="mx_ReplyPreview_clear" />
|
||||
<div className="mx_ReplyPreview_tile">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue