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

..

db

update postgresql to 11.2

2019-05-05 14:13:13 +02:00

fittrackee_api

Merge branch 'master' into v0.3.0

2019-12-29 13:39:26 +01:00

migrations

API & Client - refactor registration activation - #15

2019-11-13 21:46:28 +01:00

Dockerfile

update python deps and Dockerfile

2019-12-28 21:10:51 +01:00

poetry.lock

Merge branch 'master' into v0.3.0

2020-02-07 11:12:32 +01:00

pyproject.toml

Merge branch 'master' into v0.3.0

2020-02-07 11:12:32 +01:00

server.py

fix api config on ci - #15

2019-11-20 12:32:33 +01:00