Merge pull request #172 from atom/secure-iframe
authorCheng Zhao <zcbenz@gmail.com>
Fri, 31 Jan 2014 08:52:32 +0000 (00:52 -0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 31 Jan 2014 08:52:32 +0000 (00:52 -0800)
Add "node-integration" option to BrowserWindow


Trivial merge