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 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		5 years ago
..
archive	Fix #950 (sorting order in comics)	5 years ago
io	Merge branch 'Develop'	5 years ago
libs	Updated pdf viewer to 2.2.228 (#1184)	5 years ago
reading	Update Updater	5 years ago
caliBlur.js	Merge branch 'master' into Develop	5 years ago
details.js	Add UI support for archived books.	5 years ago
edit_books.js	Add ability to store and edit publishers	6 years ago
filter_list.js	Code cosmetics	5 years ago
get_meta.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	5 years ago
kthoom.js	Update comic reader js	6 years ago
logviewer.js	Update updater	5 years ago
main.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	5 years ago
shelforder.js	Fix #1170 Auth-digest Header no longer crashs calibre-web	5 years ago
table.js	Code cosmetics	5 years ago
uploadprogress.js	Merge branch 'Develop'	5 years ago