Merge remote-tracking branch 'cover/thumbnails' into cover_thumb

Browse Source

# Conflicts:
#	cps/admin.py
#	cps/templates/author.html
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
#	requirements.txt

...

This commit is contained in:

Ozzie Isaacs 2021-03-20 12:52:17 +01:00

parent dd30ac4fbd 2c8d055ca4

commit 30e897af48

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

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

Diff Content Not Available