Merge remote-tracking branch 'Convert_all/ebookconvert-any'

# Conflicts: # cps/web.py
2025-12-04 07:18:05 +00:00 · 2018-08-31 15:00:22 +02:00
parent 3f35200a0b 22ecdfd2bc
commit 4a95404e17
21 changed files with 4217 additions and 2357 deletions
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -254,3 +254,4 @@ $("#btn-upload-cover").on("change", function () {
    } // Remove c:\fake at beginning from localhost chrome
    $("#upload-cover").html(filename);
 });
+