Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

# Conflicts: # packages/uni-h5/dist/index.umd.min.js

Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha
# Conflicts: # packages/uni-h5/dist/index.umd.min.js
9b10a213 · fxy060608 · ee27f031 · a0d035b5 · 9b10a213 · 9b10a213
4 changed file
--- a/packages/uni-app-plus/dist/view.css
+++ b/packages/uni-app-plus/dist/view.css
--- a/packages/uni-app-plus/dist/view.umd.min.js
+++ b/packages/uni-app-plus/dist/view.umd.min.js
--- a/packages/uni-h5/dist/index.css
+++ b/packages/uni-h5/dist/index.css
--- a/packages/uni-h5/dist/index.umd.min.js
+++ b/packages/uni-h5/dist/index.umd.min.js