# Conflicts:
#	changelog.md
#	manifest.json
#	package.json
#	pages.json
#	pages/API/choose-location/choose-location.uvue
#	pages/API/compress-image/compress-image.uvue
#	pages/API/compress-video/compress-video.test.js
#	pages/API/compress-video/compress-video.uvue
#	pages/API/create-inner-audio-context/inner-audio.test.js
#	pages/API/download-file/download-file.uvue
#	pages/API/get-video-info/get-video-info.uvue
#	pages/API/inner-audio/inner-audio.uvue
#	pages/API/navigator/navigator.uvue
#	pages/API/open-location/open-location.uvue
#	pages/API/pull-down-refresh/pull-down-refresh.test.js
#	pages/API/request/request.test.js
#	pages/API/request/request.uvue
#	pages/API/show-modal/show-modal.test.js
#	pages/API/unicloud/unicloud/database.test.js
#	pages/API/upload-file/upload-file.uvue
#	pages/CSS/overflow/overflow-visible-event.uvue
#	pages/CSS/transform/scale.uvue
#	pages/component/canvas/canvas.test.js
#	pages/component/canvas/canvas.uvue
#	pages/component/checkbox/checkbox.uvue
#	pages/component/editor/editor.test.js
#	pages/component/general-event/general-event.test.js
#	pages/component/general-event/general-event.uvue
#	pages/component/image/image.test.js
#	pages/component/input/input.test.js
#	pages/component/input/input.uvue
#	pages/component/list-view/list-view-children-in-slot.test.js
#	pages/component/list-view/list-view-refresh.test.js
#	pages/component/list-view/list-view.test.js
#	pages/component/list-view/list-view.uvue
#	pages/component/map/map.test.js
#	pages/component/map/map.uvue
#	pages/component/radio/radio.uvue
#	pages/component/scroll-view/scroll-view-refresher.test.js
#	pages/component/scroll-view/scroll-view.test.js
#	pages/component/scroll-view/scroll-view.uvue
#	pages/component/swiper/swiper.test.js
#	pages/component/swiper/swiper.uvue
#	pages/component/textarea/textarea.uvue
#	pages/component/video/video.test.js
#	pages/component/video/video.uvue
#	pages/component/web-view-local/web-view-local.test.js
#	pages/component/web-view-local/web-view-local.uvue
#	pages/component/web-view/web-view.test.js
#	pages/component/web-view/web-view.uvue
#	pages/pages.test.js
#	pages/tabBar/API.uvue
#	pages/tabBar/CSS.uvue
#	pages/tabBar/component.uvue
#	pages/tabBar/template.uvue
#	pages/template/browser-canvas/browser-canvas.uvue
#	pages/template/slider-100/slider-100.uvue
#	readme.md
#	testSequencer.js

(cherry picked from commit eb3e2f38)

(cherry picked from commit 23704bac)

(cherry picked from commit 4047b74b)

This reverts commit a1089139.

This reverts commit 9fd46418.

(cherry picked from commit 4fa03875)

(cherry picked from commit 52c6d66f)

(cherry picked from commit 7da82b8a)

(cherry picked from commit 8e5e508f)

(cherry picked from commit 4c382abf)

(cherry picked from commit e0abfa7a)

This reverts commit 817f3691.

(cherry picked from commit f9b217de)