3 Commits

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	2019-06-16 08:20:01 +02:00
Ozzieisaacs	a0be02e687	Ldap working	2019-02-17 09:09:20 +01:00
Ozzieisaacs	c1ef1bcd19	User and admin pages are working again	2019-02-09 21:26:17 +01:00