Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop ...

# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot

2019-03-10 08:31:10 +01:00

..

css

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

img

- Completly new setup of GDrive (every data is taken from client_secret.json file)

2018-06-02 10:59:34 +02:00

js

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

locale

Updated pdf.js to 1.7.225 (Fix #193)

2017-05-13 14:01:52 +02:00

favicon.ico

Favicon replaced (#424) with hiher resolution

2018-01-06 11:36:23 +01:00

generic_cover.jpg

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

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