jbtbnl 18c7e95380 Merge branch 'master' into import-new-ui ... Conflicts: css/contacts.css		2014-09-15 11:14:31 +02:00
..
importconnector.php	fix issue #537, handle multiple values in a not connected property	2014-09-10 12:52:30 -04:00
importcsvconnector.php	fix php 4.3	2014-07-30 11:04:15 +02:00
importldifconnector.php	added standard vcard connector	2014-03-21 01:59:19 -04:00
importvcardconnector.php	reimplemented import ui in a ocdialog	2014-05-07 16:54:58 -04:00
ldapconnector.php	after a painful rebase	2014-05-09 14:30:14 -04:00