Merge pull request #3344 from deepak1556/certificate_verifier_api_patch
authorCheng Zhao <zcbenz@gmail.com>
Tue, 17 Nov 2015 10:53:35 +0000 (18:53 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 17 Nov 2015 10:53:35 +0000 (18:53 +0800)
session: api to allow handling certificate verification

1  2 
atom/browser/api/atom_api_app.cc
docs/api/app.md
docs/api/session.md
filenames.gypi

Simple merge
diff --cc docs/api/app.md
Simple merge
Simple merge
diff --cc filenames.gypi
Simple merge