You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:34 UTC

[23/50] [abbrv] incubator-weex git commit: Merge branch 'ios-feature-20170118' into ios-feature-20170118

Merge branch 'ios-feature-20170118' into ios-feature-20170118

Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4d5bc334
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4d5bc334
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4d5bc334

Branch: refs/heads/master
Commit: 4d5bc3344e65a5d2d3bfd06dea2d1c848ba1d9cd
Parents: b35086f 2371256
Author: acton393 <ac...@users.noreply.github.com>
Authored: Wed Jan 11 11:22:33 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jan 11 11:22:33 2017 +0800

----------------------------------------------------------------------
 examples/module/websocket-demo.we               |  2 +-
 .../Sources/Component/WXTextAreaComponent.m     | 39 +++++++++++---------
 .../Sources/Component/WXTextInputComponent.m    | 14 +++----
 3 files changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------