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/04/17 04:14:40 UTC
[25/48] incubator-weex git commit: Merge branch '0.11-dev' into dev
Merge branch '0.11-dev' into 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/11c1eb53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/11c1eb53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/11c1eb53
Branch: refs/heads/0.12-dev
Commit: 11c1eb53b510cd74439566133c39865884f7484e
Parents: cbc373b 8309bf6
Author: sospartan <so...@apache.org>
Authored: Thu Apr 6 14:26:27 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Apr 6 14:26:27 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++++++-------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 5 +----
ios/sdk/WeexSDK/Resources/main.js | 14 +++++++-------
package.json | 4 ++--
4 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------