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

Browse Source

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

...

This commit is contained in:

Ozzieisaacs

2020-04-02 18:24:32 +02:00

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

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

Diff Content Not Available