Merge branch 'Develop'
# Conflicts: # cps/db.py # cps/templates/user_edit.html
Showing
This diff is collapsed.
cps/kobo.py
0 → 100644
This diff is collapsed.
cps/kobo_auth.py
0 → 100644
cps/services/SyncToken.py
0 → 100644
... | @@ -32,3 +32,7 @@ rarfile>=2.7 | ... | @@ -32,3 +32,7 @@ rarfile>=2.7 |
# other | # other | ||
natsort>=2.2.0,<7.1.0 | natsort>=2.2.0,<7.1.0 | ||
git+https://github.com/OzzieIsaacs/comicapi.git@ad8bfe5a1c31db882480433f86db2c5c57634a3f#egg=comicapi | git+https://github.com/OzzieIsaacs/comicapi.git@ad8bfe5a1c31db882480433f86db2c5c57634a3f#egg=comicapi | ||
#Kobo integration | |||
jsonschema>=3.2.0,<3.3.0 | |||
This diff is collapsed.
Please
register
or
sign in
to comment