Merge branch 'master' into master

This commit is contained in:
Kim Gardner
2018-01-04 15:55:18 -05:00
committed by GitHub
21 changed files with 550 additions and 4 deletions
@@ -7,3 +7,6 @@ es:
zh_CN:
talk-plugin-subscriber:
subscriber: "订阅用户"
zh_TW:
talk-plugin-subscriber:
subscriber: "訂閱者"