Merge branch 'master' into simplified-chinese-merge-fixes

This commit is contained in:
Kim Gardner authored and GitHub committed 2018-01-04 16:48:46 -05:00
commit 4eaa234dd8
2 files changed
+2 -4

No files matched your search

@@ -10,7 +10,7 @@ zh_CN:
talk-plugin-love:
love: "爱"
loved: "已爱"
en:
zh_TW:
talk-plugin-love:
love: 喜歡
loved: 已喜歡