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

Support 12hr time on DateSeparator
element-hq · Jun 1, 2017 · 1fbec01 · 1fbec01
2 parents e868dbb + 640fa10
commit 1fbec01
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 (