OSDN Git Service

Merge branch 'dapp-v1.4.0' into dev
authorZhiting Lin <zlin035@uottawa.ca>
Wed, 15 Jul 2020 07:49:26 +0000 (15:49 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Wed, 15 Jul 2020 07:49:26 +0000 (15:49 +0800)
commit4bceb82d10e8b633b0104893fa4b1d994034ccbd
tree0fcbfc67ce5d59e9dee2dd74726cc5f725008fbd
parent8ffed433ee0a3ccd5060b5212ed9017d4789eeb2
parentd78a86bb8cf01602140369b0bae2d387f559a4b0
Merge branch 'dapp-v1.4.0' into dev
package-lock.json
package.json
src/assets/language/cn.js
src/utils/constants.js