Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af292302 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af292302 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af292302 Branch: refs/heads/0.16-dev Commit: af2923026bc8012bcb31b32664aae4ab4b190f82 Parents: 9f4eb8c dbdab8e Author: acton393 <zhangxing610...@gmail.com> Authored: Thu Sep 21 21:38:05 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Sep 21 21:38:05 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 4 ---- doc/source/cn/guide/index.md | 9 ++++++--- doc/source/cn/guide/set-up-env.md | 4 ++-- doc/source/cn/guide/tools/toolkit.md | 2 +- .../cn/references/advanced/extend-to-android.md | 21 ++++++++++++++++++-- doc/source/cn/references/common-style.md | 1 + doc/source/cn/references/components/text.md | 6 +++--- doc/source/cn/references/modules/animation.md | 2 ++ doc/source/cn/references/modules/dom.md | 2 +- doc/source/guide/index.md | 4 ++-- doc/source/guide/set-up-env.md | 6 +++--- doc/source/guide/tools/toolkit.md | 5 ++--- doc/source/references/common-style.md | 1 + doc/source/references/components/text.md | 8 ++++---- doc/source/references/modules/animation.md | 3 ++- doc/source/references/modules/dom.md | 2 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +++- .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + 19 files changed, 55 insertions(+), 31 deletions(-) ----------------------------------------------------------------------