OSDN Git Service

Merge branch 'keystore' into dev
authorZhiting Lin <zlin035@uottawa.ca>
Fri, 24 Jul 2020 06:11:44 +0000 (14:11 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Fri, 24 Jul 2020 06:11:44 +0000 (14:11 +0800)
commit2b8d7026954ac8979eae88e8efaf023eeb4a4ec0
tree4e827cf2fa0af8b4271ee3c3dea2c803ce6d8310
parentab2d377b556d7a067ea345eaccef8d72db8f6a3c
parent5db4ea9ae1255a55c2ecb072b460bc4ba8f44717
Merge branch 'keystore' into dev
src/models/account.js
src/views/welcome/creation.vue