Merge branch 'master' into stats

2018-12-31 15:10:51 +01:00
parent 10c0f57111 7d98e7342b
commit 0e6b9030f8
6 changed files with 35 additions and 12 deletions
--- a/fittrackee_client/src/components/Statistics/index.jsx
+++ b/fittrackee_client/src/components/Statistics/index.jsx
@ -92,7 +92,7 @@ class Statistics extends React.Component {
                      tickFormatter={value => displayedData === 'distance'
                        ? `${value} km`
                        : displayedData === 'duration'
-                          ? format(formatDuration(value), 'HH:mm')
+                          ? formatDuration(value)
                          : value
                      }
                    />