OSDN Git Service

(root) / bytom / bytom-electron.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e93119 f33aab0)
Merge branch 'master' into electron
authorZhiting Lin <zlin035@uottawa.ca>
Sun, 30 Sep 2018 02:38:50 +0000 (10:38 +0800)
committerZhiting 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
Bytom Desktop Electron App
About OSDN
Find Software
Develop Software
Help