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

2018-01-08 15:18:08 +00:00 · 2018-01-08 15:18:08 +00:00 · 54cafec57a
parent 9c7783b439 1405859d2c
commit 54cafec57a
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@ -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>
        );
    },