Ozzie Isaacs afaf496fbe Merge branch 'master' into cover_thumbnail ... # Conflicts: # cps/db.py # cps/templates/author.html # cps/templates/discover.html # cps/templates/index.html # cps/templates/search.html # cps/templates/shelf.html # cps/web.py # requirements.txt # test/Calibre-Web TestSummary_Linux.html		2022-04-02 11:57:18 +02:00
..
admin.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
author.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
book_edit.html
book_exists_flash.html
book_table.html
config_db.html
config_edit.html
config_view_edit.html
detail.html
email_edit.html
feed.xml
fragment.html
generate_kobo_auth_url.html
grid.html
http_error.html
image.html
index.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
index.xml
json.txt
languages.html
layout.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
list.html
listenmp3.html
login.html
logviewer.html
modal_dialogs.html
osd.xml
read.html
readcbr.html
readdjvu.html
readpdf.html
readtxt.html
register.html
remote_login.html
schedule_edit.html
search.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
search_form.html
shelf.html	Merge branch 'master' into cover_thumbnail	2022-04-02 11:57:18 +02:00
shelf_edit.html
shelf_order.html
shelfdown.html
stats.html
tasks.html
user_edit.html
user_table.html