* [all] merge master to release-0.16, to fix conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9a16f8ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9a16f8ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9a16f8ba Branch: refs/heads/release Commit: 9a16f8ba3d85c859126bf820acc8c251d0f7f517 Parents: e2a373f f5fbd4e Author: gurisxie <279483...@qq.com> Authored: Tue Oct 17 16:25:06 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Oct 17 16:25:06 2017 +0800 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 4 +-- CONTRIBUTING.md | 22 ++++++++-------- doc/source/cn/guide/contributing.md | 27 ++++++++++---------- doc/source/guide/contributing.md | 26 +++++++++---------- doc/source/references/platform-difference.md | 11 ++++++++ doc/source/references/platfrom-difference.md | 11 -------- .../references/vue/difference-with-web.md | 2 +- doc/themes/weex/layout/_partial/article.ejs | 2 ++ doc/themes/weex/layout/index.ejs | 3 +++ doc/themes/weex/layout/layout.ejs | 2 -- doc/themes/weex/source/css/common.scss | 4 +-- doc/themes/weex/source/css/partial/header.scss | 2 +- doc/themes/weex/source/css/post.scss | 7 ++--- doc/themes/weex/source/css/variable.scss | 2 +- html5/runtime/vdom/Element.js | 2 +- .../Sources/Component/WXCycleSliderComponent.m | 2 +- .../Sources/Display/WXComponent+BoxShadow.m | 9 ++++++- 17 files changed, 75 insertions(+), 63 deletions(-) ----------------------------------------------------------------------