Fix merge conflicts on master

This commit is contained in:
Kim Gardner committed 2018-01-04 16:43:51 -05:00
1 parent e2534e7ca8
commit bf1fbfe03f
21 files changed
+554 -4

No files matched your search

@@ -10,3 +10,7 @@ zh_CN:
talk-plugin-like:
like: "喜欢"
liked: "已喜欢"
zh_TW:
talk-plugin-like:
like: 讚
liked: 已讚