Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.3.0

Browse Source 
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
This commit is contained in:
Sam
2020-02-07 11:12:32 +01:00
parent 69bcda043d c576911c9d
commit 175c608920
55 changed files with 827 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_api/poetry.lock generated
View File

@ -948,7 +948,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["jaraco.itertools"]
[metadata]
content-hash = "0f0ae50dc4d547533e9da81603a39cd9863fc018057ed1f04f1ae41c0e62d3f3"
content-hash = "08f65db08252eef68c675d114006f74eefe78d8b287d9a93b9063716b03397bd"
python-versions = "^3.7"
[metadata.files]

2
fittrackee_api/pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "fittrackee_api"
version = "0.3.0-beta"
version = "0.2.5-beta"
description = ""
authors = ["Your Name <you@example.com>"]
license = "GPL-3.0"