Merge branch 'master' into Develop

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2023-02-06 19:02:47 +01:00
parent fb42f6bfff 14d14637cd
commit 7a4e6fbdfb
53 changed files with 901 additions and 915 deletions
@@ -99,7 +99,7 @@
      </div>
      <div class="overlay"></div>
      <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/compress/jszip.min.js') }}">
+      <script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}">
      </script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
      <script type="text/javascript">
          window.calibre = {