OSDN Git Service

merge master into electron
authorZhiting Lin <zlin035@uottawa.ca>
Sat, 21 Apr 2018 03:22:02 +0000 (11:22 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Sat, 21 Apr 2018 03:22:02 +0000 (11:22 +0800)

Trivial merge