Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop ...

# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py

2020-05-17 16:22:58 +02:00

..

css

Merge branch 'master' into Develop

2020-05-17 16:22:58 +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

2020-05-17 16:22:58 +02:00

locale

Updated pdf viewer to 2.2.228 (#1184)

2020-02-09 17:02:47 +01: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