babelouest 440fce7ca8 Merge branch 'master' of https://github.com/owncloud/contacts into ldap ... Conflicts: formats/backend_ldap_connector.xml lib/backend/abstractbackend.php lib/backend/database.php lib/backend/ldap.php lib/controller/addressbookcontroller.php		2014-03-28 10:39:25 -04:00
..
importconnector.php	added standard vcard connector	2014-03-21 01:59:19 -04:00
importcsvconnector.php	added standard vcard connector	2014-03-21 01:59:19 -04:00
importldifconnector.php	added standard vcard connector	2014-03-21 01:59:19 -04:00
importvcardconnector.php	added standard vcard connector	2014-03-21 01:59:19 -04:00
ldapconnector.php	fix bug in ldap->vcard translation that caused the remote update not to work (was hard to find this one !)	2014-03-03 22:59:50 -05:00