Fix merge conflicts on master

This commit is contained in:
Kim Gardner
2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
@@ -6,3 +6,6 @@ es:
zh_CN:
talk-plugin-sort-oldest:
label: "最早发表在前"
zh_TW:
talk-plugin-sort-oldest:
label: 最早發表優先