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/utils/index.js
+++ b/fittrackee_client/src/utils/index.js
@ -1,7 +1,7 @@
 import { format, parse } from 'date-fns'
 import { DateTime } from 'luxon'

-export const version = '0.2.0' // version stored in 'utils' for now
+export const version = '0.2.0-beta' // version stored in 'utils' for now
 export const apiUrl = `${process.env.REACT_APP_API_URL}/api/`
 export const thunderforestApiKey = `${
  process.env.REACT_APP_THUNDERFOREST_API_KEY