OSDN Git Service

Merge branch 'master' into dev
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 22 Apr 2019 07:27:00 +0000 (15:27 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 22 Apr 2019 07:27:00 +0000 (15:27 +0800)
commitdad006556d98333790451ab0c63fffcc3645c218
tree6f294601f98f803da209b37a613a345cbc294b7a
parent9e937726eb4b74b19cc4e94717066b3d965c8c64
parent9f476722a6537d88c28457a45b6cbf9bfdceec7a
Merge branch 'master' into dev
modules/interface/locales/en/translation.json
modules/interface/locales/zh/translation.json