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	Fix #950 (sorting order in comics)	2020-03-14 07:15:15 +01:00
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	Code cosmetics	2020-04-27 20:01:13 +02:00
get_meta.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	2020-04-24 21:05:56 +02:00
kthoom.js
logviewer.js	Update updater	2020-03-29 16:44:24 +02:00
main.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	2020-04-24 21:05:56 +02:00
shelforder.js
table.js	Code cosmetics	2020-04-27 20:01:13 +02:00
uploadprogress.js