OSDN Git Service

Merge branch 'vapor' of git://github.com/Bytom/dashboard into vapor
authorZhiting Lin <zlin035@uottawa.ca>
Thu, 18 Jul 2019 08:09:53 +0000 (16:09 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Thu, 18 Jul 2019 08:09:53 +0000 (16:09 +0800)
commit6a4806eed0b16f0a7bca7b22f3c9a99c4ac69867
tree30b076d79ca6a3ea1da9ee6f41549945be1ebed0
parente50053337f1b4a1475f161ff526dd4b51861b22f
parent7a8394b006fd71cfdb4d7f314bd61601730e86d0
Merge branch 'vapor' of git://github.com/Bytom/dashboard into vapor
modules/interface/locales/en/translation.json
modules/interface/locales/zh/translation.json
src/features/core/components/CoreIndex/CoreIndex.jsx