Commit Graph

3 Commits

Author SHA1 Message Date
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
OzzieIsaacs
ba8e107402 Move vendored css/js to libs folders to fix language stats 2017-02-07 20:33:08 +01:00
OzzieIsaacs
ea2e8205e3 Added code for rearranging shelfs #73 2017-01-03 20:19:32 +01:00