Merge & fix confilcts

This commit is contained in:
Guille
2016-07-17 19:44:19 +02:00
32 changed files with 1598 additions and 199 deletions
-3
View File
@@ -283,9 +283,6 @@ export class Contacts {
/**
* Search for contacts in the Contacts list.
*
* Example: Contacts.find(['*'], { filter: 'Max' }) // will search for a displayName of 'Max'
*
* @param fields {string[]} Contact fields to be used as a search qualifier.
* A zero-length contactFields parameter is invalid and results in ContactError.INVALID_ARGUMENT_ERROR.
* A contactFields value of "*" searches all contact fields.