OSDN Git Service

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)
commit72603a144297423611ab1ad49526ae8585f5ac91
treecf2bed9fe3adcaf6d796b4416cf12d118e7f51ab
parent1e931190e98e621d928e400ab8b6547938426817
parentf33aab0054cdb94bed8a765ce268296b7118384d
Merge branch 'master' into electron
modules/settings.js