Bart Visscher 9908adb320 Merge branch 'master' into vcategories ... Conflicts: apps/contacts/lib/vcard.php		2012-03-07 21:49:46 +01:00
..
addressbook.php	Localizin strings and adding error checking.	2012-01-11 20:07:15 +01:00
app.php	Merge branch 'master' into vcategories	2012-03-07 21:49:46 +01:00
connector_sabre.php	Split OC_Contacts_Addressbook in _Addressbook and _VCard	2011-09-17 00:26:57 +02:00
hooks.php	Fix missing bracket	2012-03-02 21:01:44 +01:00
search.php	Search: Change provider registration to class name, for lazy loading of search providers	2012-03-01 22:59:35 +01:00
vcard.php	Merge branch 'master' into vcategories	2012-03-07 21:49:46 +01:00