Ozzie Isaacs 3c98cd1b9a Merge branch 'master' into cover_thumbnail ... # Conflicts: # test/Calibre-Web TestSummary_Linux.html		2022-04-20 07:25:37 +02:00
..
cmaps
css	Merge branch Develop into thumbnails	2022-01-26 23:51:50 -06:00
img
js	Merge branch 'master' into cover_thumbnail	2022-04-20 07:25:37 +02:00
locale
favicon.ico
generic_cover.jpg