Thomas Tanghus 9794e7e427 Fix merge conflict.		2012-02-22 11:20:57 +01:00
..
addressbook.php	Localizin strings and adding error checking.	2012-01-11 20:07:15 +01:00
app.php	Added public static OC_VCategories object to OC_Contacts_App.	2012-02-19 23:32:09 +01:00
connector_sabre.php	Split OC_Contacts_Addressbook in _Addressbook and _VCard	2011-09-17 00:26:57 +02:00
hooks.php	Misc. changes after review by bartv.	2011-12-16 17:42:07 +01:00
search.php	Fixup use of OC_Helper::linkTo function	2012-02-17 22:07:14 +01:00
vcard.php	Fix merge conflict.	2012-02-22 11:20:57 +01:00