Merge pull request #4143 from turt2live/travis/date-sep-12h

Support 12hr time on DateSeparator
2017-06-01 18:29:53 +01:00 · 2017-06-01 18:29:53 +01:00 · 1fbec01edb
parent e868dbbb94 640fa108fc
commit 1fbec01edb
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@ -49,7 +49,7 @@ module.exports = React.createClass({
            label = days[date.getDay()];
        }
        else {
-            label = DateUtils.formatFullDate(date);
+            label = DateUtils.formatFullDate(date, this.props.showTwelveHour);
        }

        return (