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
This commit is contained in:
Sam
2020-01-30 22:45:50 +01:00
45 changed files with 1850 additions and 1099 deletions

View File

@@ -17,7 +17,7 @@ staticmap = "^0.5.4"
pytz = "^2019.3"
python-forecastio = "^1.4"
gunicorn = "^20.0"
tqdm = "^4.41"
tqdm = "^4.42"
[tool.poetry.dev-dependencies]
pytest = "^5.3"