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 b4d7733e0a Merge branch 'master' into Develop ... # Conflicts: # cps/templates/list.html # cps/translations/cs/LC_MESSAGES/messages.po # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fi/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/hu/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.po # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # messages.pot		5 years ago
..
archive	Fix #950 (sorting order in comics)	5 years ago
io	Merge branch 'Develop'	6 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	Merge branch 'Develop'	6 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	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	5 years ago
uploadprogress.js	Merge branch 'Develop'	6 years ago