FitTrackee/fittrackee_client/src
Sam 8c711a2e83 Merge branch 'master' into v0.3.0
Conflicts:
	VERSION
	docs/.buildinfo
	docs/_static/documentation_options.js
	docs/api/activities.html
	docs/api/auth.html
	docs/api/index.html
	docs/api/records.html
	docs/api/sports.html
	docs/api/stats.html
	docs/api/users.html
	docs/changelog.html
	docs/features.html
	docs/genindex.html
	docs/http-routingtable.html
	docs/index.html
	docs/installation.html
	docs/objects.inv
	docs/search.html
	docs/searchindex.js
	docs/troubleshooting/administrator.html
	docs/troubleshooting/index.html
	docs/troubleshooting/user.html
	fittrackee_api/poetry.lock
	fittrackee_client/src/utils/index.js
	yarn.lock
2020-01-30 22:45:50 +01:00
..
actions Client - add application configuration in Application Admin - #15 2019-11-13 20:16:58 +01:00
components Merge branch 'master' into v0.3.0 2020-01-30 22:45:50 +01:00
fitTrackeeApi Client - add application configuration in Application Admin - #15 2019-11-13 20:16:58 +01:00
images/flags Client - add a language dropdown 2019-09-08 16:53:47 +02:00
locales Merge branch 'master' into v0.3.0 2019-12-29 13:39:26 +01:00
reducers Client - add application configuration in Application Admin - #15 2019-11-13 20:16:58 +01:00
utils Merge branch 'master' into v0.3.0 2020-01-30 22:45:50 +01:00
i18n.js Client - refactor locales 2019-12-29 11:37:17 +01:00
index.js Client - init localization w/ react-i18n - #40 2019-09-08 11:17:02 +02:00
logo.svg API & Client: refactor (rename mpwo to fittrackee) 2018-06-07 14:45:51 +02:00
registerServiceWorker.js Client - reformat js files w/ prettier 2019-08-28 15:35:22 +02:00