Merge branch 'jsfm-feature-release' of https://github.com/Hanks10100/incubator-weex into wip-us-0.16-dev
# Conflicts: # package.json Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1ebd484e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1ebd484e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1ebd484e Branch: refs/heads/0.16-dev Commit: 1ebd484ed51e73e7e1917a259845880275bdff69 Parents: 94d7bde 5c5b33d Author: acton393 <zhangxing610...@gmail.com> Authored: Tue Aug 8 16:54:17 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Tue Aug 8 16:54:17 2017 +0800 ---------------------------------------------------------------------- package.json | 2 +- pre-build/native-bundle-main.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ebd484e/package.json ----------------------------------------------------------------------
