Merge branch 'master' into Develop

# Conflicts: # cps/editbooks.py # requirements.txt # setup.cfg # test/Calibre-Web TestSummary_Linux.html
2024-06-24 14:42:00 +02:00
parent 1a1f1498a5 89ac9ff498
commit b28a3635f8
49 changed files with 293 additions and 172 deletions
@@ -32,6 +32,7 @@ from . import logger

 log = logger.create()

+
 def get_temp_dir():
    tmp_dir = os.path.join(gettempdir(), 'calibre_web')
    if not os.path.isdir(tmp_dir):