OSDN Git Service
(root)
/
bytom
/
bytom-electron.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e93119
f33aab0
)
Merge branch 'master' into electron
author
Zhiting Lin
<zlin035@uottawa.ca>
Sun, 30 Sep 2018 02:38:50 +0000
(10:38 +0800)
committer
Zhiting Lin
<zlin035@uottawa.ca>
Sun, 30 Sep 2018 02:38:50 +0000
(10:38 +0800)
1
2
modules/settings.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/settings.js
Simple merge