OzzieIsaacs 12db39523c Merge branch 'master' of https://github.com/wuqi/calibre-web ...

# Conflicts:
#	.gitignore
#	cps/static/css/colors.css
#	cps/static/css/style.css
#	cps/web.py

2016-10-24 19:04:16 +02:00

..

css

Merge branch 'master' of https://github.com/wuqi/calibre-web

2016-10-24 19:04:16 +02:00

fonts

change google fonts to local

2016-07-20 10:41:04 +08:00

img

Update epub reader and pdf reader

2016-07-09 16:54:13 +08:00

js

Update epub reader and pdf reader

2016-07-09 16:54:13 +08:00

locale

Update epub reader and pdf reader

2016-07-09 16:54:13 +08:00

favicon.ico

Small UI fixes

2016-04-03 23:33:29 +02:00

generic_cover.jpg

check if wand is available, add dummy cover.jpg otherwise

2016-04-08 22:57:58 +02:00