Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-01-08 15:18:08 +00:00
commit 54cafec57a

View file

@ -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) + '&nbsp;' }
{ DateUtils.formatTime(date, this.props.showTwelveHour) }
</span>
);
},