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/05 09:45:18 UTC
[8/8] incubator-weex git commit: Merge branch '0.11-dev' into 0.12-dev
Merge branch '0.11-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/aee33880
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aee33880
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aee33880
Branch: refs/heads/0.12-dev
Commit: aee3388080cbb5f617f40e84860a9a3581f2aa3e
Parents: da9701c 4a5f877
Author: sospartan <so...@apache.org>
Authored: Wed Apr 5 17:44:19 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Apr 5 17:44:19 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 5 +----
build/config.js | 8 ++++++--
build/karma.vue.conf.js | 15 ++++++++++-----
package.json | 1 +
4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee33880/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee33880/package.json
----------------------------------------------------------------------