OSDN Git Service

Merge branch 'master' into electron
authorZhiting Lin <zlin035@uottawa.ca>
Tue, 24 Apr 2018 10:59:55 +0000 (18:59 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Tue, 24 Apr 2018 10:59:55 +0000 (18:59 +0800)
commitbd486de212ab2275489a985b52b684fd3ce3118f
treeb01f8674f291f661ae90ecbc1450a2ba49c8556b
parenta0531257e6e30835c092e815cd07b6a6408da4e4
parente52d92dfb50e4a54cc723ec9e0c5de8b13bc02ec
Merge branch 'master' into electron
src/features/core/components/CoreIndex/CoreIndex.jsx