Merge remote-tracking branch 'public_shelf/calibre-web_645'

Browse Source

# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html

pull/1296/head

Ozzieisaacs 5 years ago

parent bab14a1fbf dac48a2610

commit 4de80b26c1

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

Diff Content Not Available