• OzzieIsaacs's avatar
    Merge remote-tracking branch 'Comic/comic_server' · 3f35200a
    OzzieIsaacs authored
    # 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
    3f35200a
kthoom.js 20.2 KB