user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
This commit is contained in:
Ozzieisaacs
2020-01-26 19:29:36 +01:00
parent 0411d4a8c9 3c63e2b7e4
commit 2eec329bdf
13 changed files with 361 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
optional-requirements.txt
View File

@@ -31,7 +31,7 @@ rarfile>=2.7
# other
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
jsonschema>=3.2.0