OSDN Git Service

Merge Master into dev.
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 4 Mar 2019 08:58:55 +0000 (16:58 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 4 Mar 2019 08:58:55 +0000 (16:58 +0800)
commitcc6dcf21ce79a3d97cfdd9c7cb7d2a878c9a48e4
tree051bf84f618a10ce8321b5d835462e775a37f22f
parent8da29fec8e3b2fa374963801c3da8c945855d6e6
parent0291af0cdbe39168bf9cbf634f76e54ca1731d70
Merge Master into dev.
modules/interface/locales/en/translation.json
modules/interface/locales/zh/translation.json
package-lock.json
package.json
src/features/core/reducers.js