You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop ... # Conflicts: # cps/web.py # cps/worker.py		6 years ago
..
css	Merge branch 'master' into Develop	6 years ago
images/caliblur	Merge remote-tracking branch 'pdf.js/epubjs'	6 years ago
img	- Completly new setup of GDrive (every data is taken from client_secret.json file)	7 years ago
js	Merge branch 'master' into Develop	6 years ago
locale	Merge remote-tracking branch 'pdf.js/epubjs'	6 years ago
favicon.ico	Favicon replaced (#424) with hiher resolution	7 years ago
generic_cover.jpg	check if wand is available, add dummy cover.jpg otherwise	9 years ago