mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-11-30 12:24:11 +01:00
ec86736336
Fix conflicts: contacts/ajax/contact/saveproperty.php contacts/js/contacts.js contacts/lib/hooks.php contacts/lib/search.php contacts/lib/vcard.php |
||
---|---|---|
.. | ||
addressbook | ||
categories | ||
contact | ||
cropphoto.php | ||
currentphoto.php | ||
editaddress.php | ||
editname.php | ||
importdialog.php | ||
loghandler.php | ||
oc_photo.php | ||
savecrop.php | ||
selectaddressbook.php | ||
setpreference.php | ||
uploadimport.php | ||
uploadphoto.php |