Merge remote-tracking branch 'origin/develop' into develop

2017-05-30 16:28:57 +00:00 · 2017-05-30 16:28:57 +00:00 · 0e262e70f3
parent b09c673c6b 9975514850
commit 0e262e70f3
1 changed files with 1 additions and 1 deletions
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@ -56,7 +56,7 @@ function twelveHourTime(date) {
    const minutes = pad(date.getMinutes());
    const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
    hours = pad(hours ? hours : 12);
-    return `${hours}:${minutes} ${ampm}`;
+    return `${hours}:${minutes}${ampm}`;
 }

 module.exports = {