Ozzie Isaacs d9a83e0638 Merge branch 'master' into cover_thumbnail ...

# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html

2022-03-14 19:41:47 +01:00

..

cmaps

…

css

…

img

…

js

Merge branch 'master' into cover_thumbnail

2022-03-14 19:41:47 +01:00

locale

…

favicon.ico

…

generic_cover.jpg

…