Merge branch 'master' into Develop

Browse Source

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

...

This commit is contained in:

Ozzie Isaacs

2021-08-30 20:18:21 +02:00

parent c0a06eec46 42ef049b63

commit e3db2796c9

45 changed files with 3250 additions and 3239 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

2

cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js vendored

File diff suppressed because one or more lines are too long