Thomas Tanghus b83796e251 Merge branch 'master' of github.com:owncloud/apps into contacts_rework ... Conflicts: contacts/ajax/categories/categoriesfor.php contacts/ajax/contact/saveproperty.php contacts/js/contacts.js contacts/lib/vcard.php		2012-11-14 01:11:42 +01:00
..
sabre	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-11-12 00:46:15 +01:00
share	Use OCA namespace.	2012-10-25 03:34:12 +02:00
addressbook.php	Correct namespace.	2012-11-12 01:24:56 +01:00
app.php	Made adding contact work again.	2012-11-13 22:42:55 +01:00
hooks.php	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-10-30 07:19:56 +01:00
search.php	Open contact from search without reloading app.	2012-11-01 02:01:00 +01:00
vcard.php	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-11-14 01:11:42 +01:00