4 Commits

Author	SHA1	Message	Date
Ozzieisaacs	d82289e303	Deactivate ldap ... Fix setup for pypi	2019-07-14 18:37:44 +02:00
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	87ca05f129	Merge remote-tracking branch 'setup/feature/setuptools-integration'	2019-05-31 16:24:13 +02:00
Luke Murphy	b3a286c0b5	Add initial setuptools integration	2019-05-31 11:54:05 +02:00