Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop ...

# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py

2019-04-13 16:42:09 +02:00

..

css

Merge branch 'master' into Develop

2019-04-13 16:42:09 +02:00

images/caliblur

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

2019-04-13 15:02:01 +02:00

img

…

js

Merge branch 'master' into Develop

2019-04-13 16:42:09 +02:00

locale

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

2019-04-13 15:02:01 +02:00

favicon.ico

…

generic_cover.jpg

…