Commit Graph

2 Commits (d44f283a057cbc631cbf73fb30c8f9de631bf5c6)

Author SHA1 Message Date
Ozzieisaacs 13ae28edab Fix #1449 (Shelf download menu wasn't working for books with more than one format) 4 years ago
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
5 years ago