Ozzieisaacs b160a8de0b Merge branch 'master' into Develop ... # Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py		2020-04-30 18:08:28 +02:00
..
archive
io
libs
reading
caliBlur.js	Merge branch 'master' into Develop	2020-04-30 18:08:28 +02:00
details.js
edit_books.js
filter_list.js
get_meta.js
kthoom.js
logviewer.js
main.js
shelforder.js
table.js
uploadprogress.js