Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html

...

This commit is contained in:

Ozzie Isaacs

2023-02-06 19:02:47 +01:00

parent fb42f6bfff 14d14637cd

commit 7a4e6fbdfb

53 changed files with 901 additions and 915 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

13

cps/static/js/compress/jszip_epub.min.js vendored Normal file

File diff suppressed because one or more lines are too long