You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ozzieisaacs 4708347c16 Merge branch 'Develop' ... # Conflicts: # MANIFEST.in # README.md # cps/helper.py # cps/static/js/archive/archive.js # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/updater.py # cps/web.py # cps/worker.py # optional-requirements.txt		6 years ago
..
archive.js	Merge branch 'Develop'	6 years ago
rarvm.js	Update comic reader js	6 years ago
unrar.js	Fix duplicate user and email (now case insensitive #948)	6 years ago
untar.js	Fix duplicate user and email (now case insensitive #948)	6 years ago
unzip.js	Merge branch 'Develop'	6 years ago