[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/acton393/incubator-weex into wip-us-0.16-dev

[acton393]

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

Branch: refs/heads/0.16-dev
Commit: c171b4f9730d3987280f1fbf8df714f81d20bec2
Parents: dffa92f 9710aa9
Author: acton393 
Authored: Tue Aug 22 16:28:41 2017 +0800
Committer: acton393 
Committed: Tue Aug 22 16:28:41 2017 +0800

--
 .../WeexSDK/Sources/Component/WXListComponent.m | 52 ++--
 .../WeexSDK/Sources/Component/WXTextComponent.m | 15 +++---
 2 files changed, 34 insertions(+), 33 deletions(-)
--

[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/acton393/incubator-weex into wip-us-0.16-dev

[acton393]

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

Branch: refs/heads/0.16-dev
Commit: c20e93175f5520b43a347acd84d0bfc49c4b1b8b
Parents: e377699 64f0e33
Author: acton393 
Authored: Thu Aug 10 17:08:35 2017 +0800
Committer: acton393 
Committed: Thu Aug 10 17:08:35 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 ++-
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 5 -
 2 files changed, 6 insertions(+), 2 deletions(-)
--