OSDN Git Service

Merge branch 'master' into electron
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 23 Apr 2018 11:18:30 +0000 (19:18 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 23 Apr 2018 11:18:30 +0000 (19:18 +0800)

Trivial merge