calibre-web/cps/static/css/images
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
..
caliblur Fix #937 2019-06-13 20:01:37 +02:00
icomoon Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
patterns Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
black-10.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
black-25.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
black-33.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00