mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 08:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge

Browse source
This commit is contained in:
David Baker 2018-01-08 14:35:39 +00:00 committed by GitHub
parent 9c3e4a1202
commit b6c002b587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/messages/MessageTimestamp.js
View file

@ -29,8 +29,6 @@ module.exports = React.createClass({
render: function() { render: function() {
const date = new Date(this.props.ts); const date = new Date(this.props.ts);
return ( return (
<span className="mx_MessageTimestamp">
{ DateUtils.formatTime(date)+'&nbsp;' }
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }> <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
{ DateUtils.formatTime(date, this.props.showTwelveHour) + '&nbsp;' } { DateUtils.formatTime(date, this.props.showTwelveHour) + '&nbsp;' }
</span> </span>