Merge pull request #5408 from electron/ld-update-code-of-conduct
authorCheng Zhao <zcbenz@gmail.com>
Fri, 6 May 2016 01:41:25 +0000 (10:41 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 6 May 2016 01:41:25 +0000 (10:41 +0900)
:memo: Update to v1.4 of the Code of Conduct


Trivial merge