Ozzieisaacs 4fecce0a0d Merge branch 'master' into Develop ...

# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt

2019-05-31 11:17:47 +02:00

..

css

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

images/caliblur

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +02: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-05-31 11:17:47 +02:00

locale

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +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