# Conflicts:
#   docs/component/uniui/uni-forms.md

### 广告相关组件/API 信息流(Banner)指向页错误

See merge request !150

更新docs/component/editor.md

See merge request !157

文字错误

See merge request !158

Update uni-table.md 根节点->叶子节点

See merge request !169

Update global.md

See merge request !170

Update uni-data-picker.md

See merge request !171

Update audio-context.md - 增加 音频组件偶现-99错误码问题的解决方案

See merge request !172

语句不通顺

See merge request !174

Update app-oauth-facebook.md

See merge request !177

border 属性名重复

See merge request !180

Update app-oauth-weixin.md

See merge request !181

Update native-js.md

See merge request !182

docs(button): Fixed a spelling error

Update share.md

Update page.md

fix(uni-forms): 修正文字描述错误问题