Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail

Browse Source

# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/helper.py
#	cps/tasks/upload.py
#	cps/updater.py
#	cps/web.py

...

This commit is contained in:

Ozzie Isaacs

2022-02-08 19:55:20 +01:00

parent e22b3da601 62ff6f7e8a

commit 4a0dde0371

39 changed files with 1922 additions and 5326 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

5807

test/Calibre-Web TestSummary_Windows.html

File diff suppressed because it is too large Load Diff