OSDN Git Service

Merge branch 'dashboardmaster' into dev
authorZhiting Lin <zlin035@uottawa.ca>
Wed, 17 Apr 2019 06:03:21 +0000 (14:03 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Wed, 17 Apr 2019 06:03:21 +0000 (14:03 +0800)
commitb36d0f80ced1e5c7e9b741618f5b3f3fd2aba435
treeb29f4edeb6da7e523d3e18b906ef9c57966efbad
parent8751cc495b25c52dc12bff0c3198d24df30882d6
parentb64726ab01a272a41cd2bc24a689527795173941
Merge branch 'dashboardmaster' into dev
modules/interface/locales/en/translation.json
modules/interface/locales/zh/translation.json
src/features/configuration/components/Index/Index.jsx
src/features/core/reducers.js