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
@@ -7,5 +7,8 @@
},
"zh_CN": {
"off_topic": "无关主题"
},
"zh_TW": {
"off_topic": "無關主題"
}
}