Commit 4de80b26 authored by Ozzieisaacs's avatar Ozzieisaacs

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

# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html
parents bab14a1f dac48a26
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment