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

2019-07-13 20:54:21 +02:00

..

bitstream.js

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

bytebuffer.js

Update comic reader js

2019-06-17 19:48:17 +02:00

bytestream.js

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00