mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-12 06:15:28 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
54cafec57a
1 changed files with 1 additions and 1 deletions
|
@ -30,7 +30,7 @@ module.exports = React.createClass({
|
|||
const date = new Date(this.props.ts);
|
||||
return (
|
||||
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
|
||||
{ DateUtils.formatTime(date, this.props.showTwelveHour) + ' ' }
|
||||
{ DateUtils.formatTime(date, this.props.showTwelveHour) }
|
||||
</span>
|
||||
);
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue