Merge branch 'master' of https://github.com/electron/electron
authorCheng Zhao <zcbenz@gmail.com>
Wed, 11 May 2016 06:15:15 +0000 (15:15 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 11 May 2016 06:15:15 +0000 (15:15 +0900)
1  2 
lib/browser/api/app.js

Simple merge