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/24 09:34:03 UTC

[45/51] [abbrv] incubator-weex git commit: Merge branch '0.12-dev-feature-jsfm0.20.5' of https://github.com/atomtong/incubator-weex into 0.12-dev

Merge branch '0.12-dev-feature-jsfm0.20.5' 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/73995da9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/73995da9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/73995da9

Branch: refs/heads/0.13-dev
Commit: 73995da910915193b61df6eba00cff6a3ae9b634
Parents: 25dfede 8a56e2f
Author: bobning <ni...@163.com>
Authored: Mon Apr 24 16:46:05 2017 +0800
Committer: bobning <ni...@163.com>
Committed: Mon Apr 24 16:46:05 2017 +0800

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