projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
83ae14f
b8e5180
)
Merge pull request #6354 from electron/package-json-bom
author
Cheng Zhao
<zcbenz@gmail.com>
Wed, 6 Jul 2016 00:48:37 +0000
(09:48 +0900)
committer
GitHub
<noreply@github.com>
Wed, 6 Jul 2016 00:48:37 +0000
(09:48 +0900)
Use require to load package.json
Trivial merge