OSDN Git Service

Merge branch 'dashboardmaster' into dev
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 19 Nov 2018 01:59:04 +0000 (09:59 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 19 Nov 2018 01:59:04 +0000 (09:59 +0800)
commit634aa0ba280e032e659c8cd5463d4369727d1d6a
tree4772fceb95bc2f6e63196df382819b4c64e21087
parent3af9ded616c5e0a7ee979f9ba94258acbb5c3ce4
parent0b232f170f0bedba740ddd683b0a19242a17f637
Merge branch 'dashboardmaster' into dev
src/locales/en/translation.json
src/locales/zh/translation.json