Merge branch 'develop' into wmwragg/direct-chat-sublist

2016-08-23 12:49:43 +01:00 · 2016-08-23 12:49:43 +01:00 · 65d7d01dfa
commit 65d7d01dfa
parent 2cf2df20f6 1d1f89e0de
27 changed files with 292 additions and 163 deletions
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@ -26,7 +26,7 @@ module.exports = React.createClass({
        var date = new Date(this.props.ts);
        return (
            <span className="mx_MessageTimestamp">
-                { DateUtils.formatDate(date) }
+                { DateUtils.formatTime(date) }
            </span>
        );
    },