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

# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html
pull/1296/head
Ozzieisaacs 5 years ago
commit 4de80b26c1

Diff Content Not Available