2 Commits (96d6018ecc591370d32b872cf6b8c82a29d1ba54)

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	6 years ago
Luke Murphy	b3a286c0b5	Add initial setuptools integration	6 years ago