# Conflicts:
#	docs/api/media/video.md
#	docs/api/ui/font.md
#	docs/api/ui/nodes-info.md
#	lerna.json
#	packages/uni-app-plus-nvue/package.json
#	packages/uni-app-plus/package.json
#	packages/uni-cli-shared/package.json
#	packages/uni-h5-ui/package.json
#	packages/uni-h5/dist/index.css
#	packages/uni-h5/dist/index.umd.min.js
#	packages/uni-h5/package.json
#	packages/uni-mp-alipay/package.json
#	packages/uni-mp-baidu/package.json
#	packages/uni-mp-qq/package.json
#	packages/uni-mp-toutiao/package.json
#	packages/uni-mp-weixin/package.json
#	packages/uni-stat/package.json
#	packages/uni-template-compiler/package.json
#	packages/vue-cli-plugin-hbuilderx/package.json
#	packages/vue-cli-plugin-uni-optimize/package.json
#	packages/vue-cli-plugin-uni/package.json
#	packages/webpack-uni-mp-loader/package.json
#	packages/webpack-uni-pages-loader/package.json
#	src/core/view/components/image/index.vue