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
..
__init__.py
convert.py
database.py
mail.py	Merge branch 'master' into Develop	2023-01-28 18:52:50 +01:00
metadata_backup.py
thumbnail.py
upload.py