OzzieIsaacs 3f35200a0b 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		2018-08-31 10:47:58 +02:00
..
fonts
images
libs	Fix #590, #589.	2018-08-27 22:08:55 +02:00
caliBlur-style.css
kthoom.css
main.css
popup.css
style.css	Added posibility to upload cover from local drive (#439)	2018-08-28 14:07:48 +02:00