4 Commits

Author	SHA1	Message	Date
babelouest	b2d26811e3	fixed scrutinizer issues	2014-05-09 15:18:44 -04:00
babelouest	c682a3585d	Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap ... Conflicts: admin.php lib/backend/ldap.php lib/dispatcher.php	2014-05-09 14:54:49 -04:00
babelouest	de4bb76c53	after a painful rebase	2014-05-09 14:30:14 -04:00
babelouest	a3166ee452	add admin settings to enable/disable ldap backend	2014-05-05 01:10:01 -04:00