Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop ... # Conflicts: # cps/web.py # cps/worker.py		2019-04-14 18:18:39 +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	- 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-04-14 18:18:39 +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