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

@@ -7,3 +7,6 @@ es:
zh_CN:
talk-plugin-subscriber:
subscriber: "订阅用户"
zh_TW:
talk-plugin-subscriber:
subscriber: "訂閱者"