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		2020-04-25 20:06:25 +02:00
..
archive	Fix #950 (sorting order in comics)	2020-03-14 07:15:15 +01:00
io	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
libs	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
reading	Update Updater	2020-02-23 07:54:58 +01:00
caliBlur.js	Merge branch 'master' into Develop	2020-04-04 06:22:17 +02:00
details.js	Add UI support for archived books.	2020-01-26 00:27:54 -05:00
edit_books.js
filter_list.js	Merge branch 'Develop'	2019-07-13 20:54:21 +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	Fix #1170 Auth-digest Header no longer crashs calibre-web	2020-02-02 07:47:27 +01:00
table.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	2020-04-24 21:05:56 +02:00
uploadprogress.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00