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/26 09:26:52 UTC
[13/14] incubator-weex git commit: Merge branch '0.13-dev' into
0.13-dev-mainjs
Merge branch '0.13-dev' into 0.13-dev-mainjs
# Conflicts:
# ios/sdk/WeexSDK/Resources/main.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0f75fe19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0f75fe19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0f75fe19
Branch: refs/heads/0.13-dev
Commit: 0f75fe196cb5ee39509fa8cdd4274510e352971c
Parents: 7ce3f79 86c555e
Author: sospartan <so...@apache.org>
Authored: Wed Apr 26 11:03:38 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Apr 26 11:03:38 2017 +0800
----------------------------------------------------------------------
.travis.yml | 25 -------------------------
package.json | 4 ++--
pre-build/native-bundle-main.js | 14 +++++++-------
3 files changed, 9 insertions(+), 34 deletions(-)
----------------------------------------------------------------------