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.
parallel-library/cps/static
Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
6 years ago
..
css Merge branch 'master' into Develop 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 Updated pdf.js to 1.7.225 (Fix #193) 8 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