Sam 175c608920 Merge branch 'master' into v0.3.0 ... Conflicts: docs/objects.inv docs/searchindex.js fittrackee_api/poetry.lock fittrackee_api/pyproject.toml fittrackee_client/src/actions/index.js fittrackee_client/src/components/App.jsx fittrackee_client/src/utils/index.js		2020-02-07 11:12:32 +01:00
..
api	API - minor refactor and documentation update	2019-11-13 19:14:29 +01:00
troubleshooting	update documentation	2019-07-14 21:37:55 +02:00
changelog.md.txt	update CHANGELOG.md	2020-01-31 15:23:57 +01:00
features.rst.txt	update CHANGELOG.md	2020-01-31 14:23:31 +01:00
index.rst.txt	update CHANGELOG.md	2020-01-31 14:23:31 +01:00
installation.rst.txt	update documentation	2020-02-02 09:57:48 +01:00