Merge branch 'master' into v0.3.0

2020-05-01 09:51:19 +02:00
parent 6270b15e11 b6c445b6df
commit aa29231fd9
36 changed files with 1809 additions and 1481 deletions
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/ActivitySegments.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivitySegments.jsx
@ -18,8 +18,9 @@ export default function ActivitySegments(props) {
                    key={`segment-${index}`}
                  >
                    <Link
-                      to={`/activities/${segment.activity_id}/segment/${index +
-                        1}`}
+                      to={`/activities/${segment.activity_id}/segment/${
+                        index + 1
+                      }`}
                    >
                      {t('activities:segment')} {index + 1}
                    </Link>{' '}