1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-30 12:24:11 +01:00
OwncloudContactsOfficial/ajax/categories
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
..
add.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
addto.php app:contacts: Add/remove multiple contacts to/from group. 2012-11-01 15:31:58 +01:00
categoriesfor.php Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-11-14 01:11:42 +01:00
delete.php Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-11-14 01:11:42 +01:00
list.php Make groups sortable. 2012-10-26 01:57:16 +02:00
removefrom.php app:contacts: Add/remove multiple contacts to/from group. 2012-11-01 15:31:58 +01:00
rescan.php Use OCA namespace. 2012-10-25 03:34:12 +02:00