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/04/13 02:19:11 UTC
[6/6] incubator-weex git commit: Merge branch
'0.12-dev-feature-jsfm0.20.3' of https://github.com/atomtong/incubator-weex
into 0.12-dev
Merge branch '0.12-dev-feature-jsfm0.20.3' of https://github.com/atomtong/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/3806842c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3806842c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3806842c
Branch: refs/heads/0.12-dev
Commit: 3806842c06749064091fa85b565b1c5c91893d76
Parents: 68acd19 3ea3764
Author: cxfeng <cx...@apache.org>
Authored: Thu Apr 13 10:18:55 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Apr 13 10:18:55 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 15 ++++++++-------
ios/sdk/WeexSDK/Resources/main.js | 15 ++++++++-------
2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------