Merge branch 'master' of github.com:electron/electron into zh-cn-docs
authorx-yao <xyao201@qq.com>
Mon, 26 Dec 2016 04:03:00 +0000 (12:03 +0800)
committerx-yao <xyao201@qq.com>
Mon, 26 Dec 2016 04:03:00 +0000 (12:03 +0800)
1  2 
docs-translations/zh-CN/README.md

Simple merge