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/13 02:32:17 UTC

[23/23] incubator-weex git commit: Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev

Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/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/8c90235c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c90235c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c90235c

Branch: refs/heads/0.12-dev
Commit: 8c90235c2b464ad224d09c984b699220c00a920e
Parents: b932600 3806842
Author: sospartan <so...@apache.org>
Authored: Thu Apr 13 10:31:45 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Apr 13 10:31:45 2017 +0800

----------------------------------------------------------------------
 android/sdk/assets/main.js        | 15 ++++++++-------
 ios/sdk/WeexSDK/Resources/main.js | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------