OSDN Git Service

merge master into electron
authorZhiting Lin <zlin035@uottawa.ca>
Tue, 22 May 2018 02:41:05 +0000 (10:41 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Tue, 22 May 2018 02:41:05 +0000 (10:41 +0800)
commitae5aa8af756f70484d84cc29c977f3ecfc252a1b
treebac1f042cf84156932e486cf0decd80d7f6971e7
parent8a7e7cddb8678fcb201c5f43bda4c511dda7e9b3
parent3a89198d400972aff55f6753e99a0d643d33f417
merge master into electron
src/utility/environment.js