Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-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/a0a917ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a0a917ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a0a917ad

Branch: refs/heads/0.16-dev
Commit: a0a917add1d79ff584984b870d92bd8e768880e0
Parents: 369befd 51ed22d
Author: acton393 <zhangxing610...@gmail.com>
Authored: Fri Aug 11 17:38:23 2017 +0800
Committer: acton393 <zhangxing610...@gmail.com>
Committed: Fri Aug 11 17:38:23 2017 +0800

----------------------------------------------------------------------
 doc/source/_posts/arkit.md                      | 112 +++++++++++++++++++
 doc/source/_posts/cn/hello.md                   |   6 -
 doc/source/_posts/hello_world.md                |   7 --
 doc/source/_posts/test.md                       |  14 ---
 doc/source/cn/blog/index.md                     |   4 -
 .../cn/references/advanced/extend-to-ios.md     |   4 +-
 .../advanced/integrate-devtool-to-android.md    |  86 +++++++++++++-
 doc/source/cn/references/components/text.md     |   4 +-
 doc/source/references/advanced/extend-to-ios.md |   5 +-
 doc/source/references/components/text.md        |   4 +-
 doc/themes/weex/layout/_partial/header.ejs      |   1 +
 .../weex/layout/_partial/post/summary.ejs       |   1 +
 doc/themes/weex/source/css/blog.scss            |   3 +
 doc/themes/weex/source/css/media-queries.scss   |   1 +
 doc/themes/weex/source/css/partial/header.scss  |   6 +-
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +-
 16 files changed, 217 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


Reply via email to