Merge branch 'master' into Develop
# Conflicts: # cps/templates/user_edit.html # optional-requirements.txt
Showing
cps/tess.py
deleted
100644 → 0
No preview for this file type
No preview for this file type
No preview for this file type
... | @@ -31,7 +31,7 @@ rarfile>=2.7 | ... | @@ -31,7 +31,7 @@ rarfile>=2.7 |
# other | # other | ||
natsort>=2.2.0 | natsort>=2.2.0 | ||
git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi | git+https://github.com/OzzieIsaacs/comicapi.git@ad8bfe5a1c31db882480433f86db2c5c57634a3f#egg=comicapi | ||
#kobo integration | #kobo integration | ||
jsonschema>=3.2.0 | jsonschema>=3.2.0 | ||
Please
register
or
sign in
to comment