Merge branch 'master' into v0.2

2019-01-13 15:35:44 +01:00
parent 68f0d47b2f 012c83121d
commit 031d8da512
25 changed files with 558 additions and 480 deletions
--- a/fittrackee_client/src/components/Dashboard/ActivityCard.jsx
+++ b/fittrackee_client/src/components/Dashboard/ActivityCard.jsx
@ -49,7 +49,7 @@ export default function ActivityCard (props) {
          <div className="col">
            <p>
              <i className="fa fa-clock-o" aria-hidden="true" />{' '}
-              Duration: {activity.duration}
+              Duration: {activity.moving}
              {activity.map ? (
                <span><br /><br /></span>
              ) : (