Merge branch 'master' into development
# Conflicts: # cps/server.py # test/Calibre-Web TestSummary_Linux.html
Showing
... | @@ -30,7 +30,7 @@ rarfile>=2.7 | ... | @@ -30,7 +30,7 @@ rarfile>=2.7 |
# other | # other | ||
natsort>=2.2.0,<7.1.0 | natsort>=2.2.0,<7.1.0 | ||
comicapi>= 2.1.3,<2.2.0 | comicapi>= 2.2.0,<2.3.0 | ||
#Kobo integration | #Kobo integration | ||
jsonschema>=3.2.0,<3.3.0 | jsonschema>=3.2.0,<3.3.0 |
... | @@ -6,7 +6,7 @@ singledispatch>=3.4.0.0,<3.5.0.0 | ... | @@ -6,7 +6,7 @@ singledispatch>=3.4.0.0,<3.5.0.0 |
backports_abc>=0.4 | backports_abc>=0.4 | ||
Flask>=1.0.2,<1.2.0 | Flask>=1.0.2,<1.2.0 | ||
iso-639>=0.4.5,<0.5.0 | iso-639>=0.4.5,<0.5.0 | ||
PyPDF2>=1.26.0,<1.27.0 | PyPDF3>=1.0.0,<1.0.4 | ||
pytz>=2016.10 | pytz>=2016.10 | ||
requests>=2.11.1,<2.25.0 | requests>=2.11.1,<2.25.0 | ||
SQLAlchemy>=1.3.0,<1.4.0 | SQLAlchemy>=1.3.0,<1.4.0 | ||
... | ... |
Please
register
or
sign in
to comment