Commit Graph

4 Commits (e16c0caebb93244d3ad1d2482553cc84d762c089)

Author SHA1 Message Date
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
6 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
6 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 6 years ago
Luke Murphy b3a286c0b5
Add initial setuptools integration 6 years ago