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
..
abstractbackend.php	rebase	2014-05-09 13:54:45 -04:00
database.php	Cleanup backend code and docs	2014-04-24 15:30:59 +02:00
ldap.php	after a painful rebase	2014-05-09 14:30:14 -04:00
localusers.php	Updates to localusers backend. cc @LEDfan	2014-04-24 15:30:59 +02:00
shared.php	Cleanup backend code and docs	2014-04-24 15:30:59 +02:00