GitHub user gubaojian opened a pull request:

    https://github.com/apache/incubator-weex/pull/1019

     [WEEX-174][android] TemplateList Support Lifecycle and statefull component

     [WEEX-174][android] TemplateList Support Lifecycle and statefull component

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/gubaojian/incubator-weex 
release-0.17-template-list-second

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-weex/pull/1019.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1019
    
----
commit 20c293f4a9c4c14daa0deee19b9d9b9a4b73693b
Author: Zz <zhuzhi2013@...>
Date:   2018-01-22T09:43:54Z

    #import <coreText/CoreText.h>   ==>   #import <CoreText/CoreText.h>

commit 886d859ab75ef892aad50506dace5818c06b66d2
Author: jianbai.gbj <jianbai.gbj@...>
Date:   2017-12-20T07:07:01Z

    [WEEX-174][android] TemplateList Support Lifecycle and statefull component

commit 30ad3f6c0c13c635c0acdeb40a80f3064330248a
Author: jianbai.gbj <jianbai.gbj@...>
Date:   2018-02-08T04:01:44Z

    Merge remote-tracking branch 'origin/master_apache' into 
release-0.17-template-list-second
    
    # Conflicts:
    #   
android/sdk/src/main/java/com/taobao/weex/dom/action/UpdateAttributeAction.java

----


---

Reply via email to