mirror of
https://github.com/JonathanHerrewijnen/calibre-web.git
synced 2024-09-22 06:02:27 +00:00
Merge remote-tracking branch 'public_shelf/calibre-web_645'
# Conflicts: # cps/templates/feed.xml # cps/templates/layout.html
This commit is contained in:
commit
4de80b26c1