Merge pull request #9099 from electron/certificate-trust

author Kevin Sawicki <kevin@github.com>

Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)

committer GitHub <noreply@github.com>

Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)
author Kevin Sawicki <kevin@github.com>
Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)
committer GitHub <noreply@github.com>
Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)
diff --cc atom/browser/api/atom_api_dialog.cc
Simple merge
diff --cc docs/api/dialog.md
Simple merge
diff --cc electron.gyp
Simple merge
author	Kevin Sawicki <kevin@github.com>
	Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)
committer	GitHub <noreply@github.com>
	Tue, 4 Apr 2017 18:17:09 +0000 (11:17 -0700)
		1	2
atom/browser/api/atom_api_dialog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
docs/api/dialog.md	patch \|	diff1 \|	diff2 \|	blob \| history
electron.gyp	patch \|	diff1 \|	diff2 \|	blob \| history