Merge branch 'master' into v0.2.3

2019-12-28 21:22:00 +01:00
parent 1a75172d28 c1f33ddacc
commit f1298aa7ba
41 changed files with 629 additions and 514 deletions
--- a/fittrackee_client/src/utils/index.js
+++ b/fittrackee_client/src/utils/index.js
@ -10,7 +10,7 @@ const getFileSize = fileSize => {
  )
 }

-export const version = '0.3.0-beta' // version stored in 'utils' for now
+export const version = '0.2.2-beta' // version stored in 'utils' for now
 export const apiUrl = `${process.env.REACT_APP_API_URL}/api/`
 /* prettier-ignore */
 export const thunderforestApiKey = `${