OSDN Git Service

merge dashbord master into electron.
authorZhiting Lin <zlin035@uottawa.ca>
Thu, 15 Nov 2018 01:56:59 +0000 (09:56 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Thu, 15 Nov 2018 01:56:59 +0000 (09:56 +0800)
commit3af9ded616c5e0a7ee979f9ba94258acbb5c3ce4
treeae974449aa8e085f3da780287004afd0575a8495
parentbd12ee89e179bf371d2430ea0135f3db75b2518a
parent8c5d141b76442981cab07275d1cc47e508e05385
merge dashbord master into electron.
package-lock.json
package.json
src/features/initialization/components/Index/Index.jsx
src/locales/en/translation.json
src/locales/zh/translation.json