Cheng Zhao 8ac93e02c6 Merge pull request #5616 from electron/inherit-zoom ... Inherit zoomFactor in webview		2016-05-20 00:27:06 +00:00
..
browser	Merge pull request #5616 from electron/inherit-zoom	2016-05-20 00:27:06 +00:00
common	Merge pull request #5617 from electron/dont-return-from-on-functions	2016-05-20 00:26:29 +00:00
renderer	Merge pull request #5616 from electron/inherit-zoom	2016-05-20 00:27:06 +00:00