1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-10 21:24:33 +01:00
OwncloudContactsOfficial/ajax/contact
Thomas Tanghus ec86736336 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php
2012-10-30 07:19:56 +01:00
..
add.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
addproperty.php Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-30 07:19:56 +01:00
delete.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
deleteproperty.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
details.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
list.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
listbycategory.php First work on new Contacts js and group based UI. 2012-09-17 16:15:31 +02:00
move.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
saveproperty.php Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-30 07:19:56 +01:00