Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html

...

This commit is contained in:

Ozzie Isaacs

2022-01-23 17:51:54 +01:00

parent 1a6579312f ede273a8f9

commit 127bf98aac

89 changed files with 8586 additions and 7547 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

test/Calibre-Web TestSummary.html

-2947

File diff suppressed because it is too large Load Diff