You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/22 02:00:02 UTC

[29/50] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev

Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/7344bf1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7344bf1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7344bf1c

Branch: refs/heads/0.12-dev
Commit: 7344bf1cf8fe8e94adae34393954bd942d28f64f
Parents: 1d41569 c6c6399
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 17 10:36:52 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 17 10:36:52 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Resources/main.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------