Ozzie Isaacs e22b3da601 Merge branch 'master' into Develop ... # Conflicts: # cps/tasks/convert.py # test/Calibre-Web TestSummary_Linux.html		2022-02-07 13:57:50 +01:00
..
__init__.py
convert.py	Merge branch 'master' into Develop	2022-02-07 13:57:50 +01:00
mail.py
upload.py	Improved logging of book title on upload	2022-02-06 16:33:12 +01:00