Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop ...

# Conflicts:
#	cps/shelf.py

2020-02-09 07:00:04 +01:00

..

css

Handle stream output in logviewer

2020-01-07 20:26:59 +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

2020-02-09 07:00:04 +01: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

…