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)
commitc81128b675805ca2e6c3d3386a4d16aeced47837
tree660f24cee91529e00a35a5b394846882ad5ef01c
parent6478244fbf38947828257744c2dab91a4260f034
parent2634328720bf018d4643ee6d4a3aea7ecca62ca2
Merge pull request #172 from atom/secure-iframe

Add "node-integration" option to BrowserWindow