Commit Graph

4 Commits

Author SHA1 Message Date
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
Sam
99ee0e4200 Merge branch 'master' into v0.3.0 2019-12-29 13:39:26 +01:00
Sam
7ffcaad332 API & Client - refactor registration activation - #15 2019-11-13 21:46:28 +01:00
Sam
97534b698b API - minor refactor and documentation update 2019-11-13 19:14:29 +01:00