Merge pull request #6105 from zephyrzoom/master
authorCheng Zhao <zcbenz@gmail.com>
Sun, 19 Jun 2016 10:11:32 +0000 (10:11 +0000)
committerGitHub <noreply@github.com>
Sun, 19 Jun 2016 10:11:32 +0000 (10:11 +0000)
commit7c2c0ce709a5c359f4b3edab3b3d5df289818c9d
tree99f6d3d4eeee8090bcb46ed67de885cacb19e156
parent52350b5e35a871247c24ff31ed2720690683cf6f
parentab41965124d6ff4e2af72f667875b1403e70bd11
Merge pull request #6105 from zephyrzoom/master

Update electron-faq.md