Merge branch 'master' into v0.2

2019-01-05 12:57:19 +01:00
parent 2a2d3e02ab f4f486606d
commit 02999107fb
5 changed files with 94 additions and 87 deletions
--- a/fittrackee_client/src/actions/activities.js
+++ b/fittrackee_client/src/actions/activities.js
@ -2,7 +2,7 @@ import { parse } from 'date-fns'

 import FitTrackeeGenericApi from '../fitTrackeeApi'
 import { history } from '../index'
-import { formatChartData } from '../utils/stats'
+import { formatChartData } from '../utils/activities'
 import { setError, setLoading } from './index'
 import { loadProfile } from './user'