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
..
__init__.py
convert.py	Merge branch 'master' into cover_thumbnail	2022-03-14 19:41:47 +01:00
database.py
mail.py	Merge branch 'master' into cover_thumbnail	2022-03-14 19:41:47 +01:00
thumbnail.py	small change	2022-02-08 20:15:01 +01:00
upload.py	Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail	2022-02-08 19:55:20 +01:00