OSDN Git Service

Merge branch 'multilingual' into electron
authorZhiting Lin <zlin035@uottawa.ca>
Fri, 16 Mar 2018 02:41:37 +0000 (10:41 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Fri, 16 Mar 2018 02:41:37 +0000 (10:41 +0800)
commitddabcabb7992dcef3da1502cbea662136ed65781
treeea385257ee2c1b25261649c52afb007a0963d21c
parentb67721ac0c9f7f102d8162a84a8c8d94ddbde437
parent3fcf9e410be1f54e79637e4916f9e96a4404bfa4
Merge branch 'multilingual' into electron