Commit Graph

3 Commits (9b74d51f2192c76711a2d1f35020bcd2fb40dc35)

Author SHA1 Message Date
Ozzieisaacs 9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago