You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/29 06:49:00 UTC
[08/18] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' 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/d9582819
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d9582819
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d9582819
Branch: refs/heads/0.12-dev
Commit: d95828190fd41855ebff102ae41ef49b870dfdcd
Parents: 9fc0336 d81b16a
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 23 11:07:20 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 23 11:07:20 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/NestedContainer.java | 2 ++
.../src/main/java/com/taobao/weex/ui/component/WXEmbed.java | 6 ++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------