Merge pull request #7596 from electron/function-param-types
authorKevin Sawicki <kevin@github.com>
Mon, 24 Oct 2016 03:40:41 +0000 (12:40 +0900)
committerGitHub <noreply@github.com>
Mon, 24 Oct 2016 03:40:41 +0000 (12:40 +0900)
Function param types

1  2 
docs/api/app.md
docs/api/web-contents.md

diff --cc docs/api/app.md
Simple merge
index 2ae7532dc430071123650515649cb6fd637cfaa1,eaf058ef7f8736bd105270f6970f469a036f2dac..2ac0f864f53aab522c26b2488de5e7878c5d7849
@@@ -261,8 -262,9 +262,9 @@@ Returns
  
  * `event` Event
  * `url` URL
 -* `certificateList` Certificate[]
 +* `certificateList` [Certificate[]](structures/certificate.md)
  * `callback` Function
+   * `certificate` [Certificate](structures/certificate.md) - Must be a certificate from the given list
  
  Emitted when a client certificate is requested.