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)
1  2 
src/locales/en/translation.json
src/locales/zh/translation.json

Simple merge
Simple merge