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

Branch: refs/heads/0.12-dev
Commit: afad8d287d7da92000835eefc2bfba9d0daa7233
Parents: 1aa4ec0 8b9cf60
Author: cxfeng <cxf...@apache.org>
Authored: Thu Apr 20 16:35:48 2017 +0800
Committer: cxfeng <cxf...@apache.org>
Committed: Thu Apr 20 16:35:48 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m     |  2 +-
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 13 +++++++------
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 11 ++++++++++-
 3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


Reply via email to