Ozzie Isaacs 508e2b4d0a Merge branch 'master' into Develop ...

# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html

2023-01-28 18:52:50 +01:00

..

cmaps

…

css

Merge branch 'master' into Develop

2023-01-28 18:52:50 +01:00

img

…

js

Merge branch 'master' into Develop

2023-01-28 18:52:50 +01:00

locale

…

standard_fonts

…

favicon.ico

…

generic_cover.jpg

…