Merge branch 'develop' into new-guest-access

This commit is contained in:
Luke Barnard 2017-05-22 16:17:36 +01:00
commit 299dc7fe84
297 changed files with 920 additions and 671 deletions

View file

@ -25,7 +25,7 @@ module.exports = React.createClass({
render: function() {
var date = new Date(this.props.ts);
return (
<span className="mx_MessageTimestamp" title={ DateUtils.formatDate(date) }>
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
{ DateUtils.formatTime(date) }
</span>
);