Merge remote-tracking branch 'Comic/comic_server'
# Conflicts: # cps/helper.py # cps/static/js/archive.js # cps/static/js/io.js # cps/static/js/kthoom.js # cps/static/js/unrar.js # cps/static/js/untar.js # cps/static/js/unzip.js # cps/templates/config_edit.html # cps/templates/detail.html # cps/templates/readcbr.html # cps/templates/stats.html # cps/ub.py # cps/web.py # optional-requirements.txt
Showing
cps/static/js/bytestream.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
... | @@ -16,3 +16,5 @@ goodreads>=0.3.2 | ... | @@ -16,3 +16,5 @@ goodreads>=0.3.2 |
python-Levenshtein>=0.12.0 | python-Levenshtein>=0.12.0 | ||
# other | # other | ||
lxml==3.7.2 | lxml==3.7.2 | ||
rarfile>=2.7 | |||
natsort>=2.2.0 |
Please
register
or
sign in
to comment