Ozzieisaacs 4708347c16 Merge branch 'Develop' ... # Conflicts: # MANIFEST.in # README.md # cps/helper.py # cps/static/js/archive/archive.js # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/updater.py # cps/web.py # cps/worker.py # optional-requirements.txt		2019-07-13 20:54:21 +02:00
..
css	Merge branch 'Develop'	2019-07-13 20:54:21 +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 'Develop'	2019-07-13 20:54:21 +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