You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/06/15 06:29:30 UTC
[3/6] incubator-weex git commit: Merge remote-tracking branch
'wip-us/0.14-dev' into 0.14-dev
Merge remote-tracking branch 'wip-us/0.14-dev' into 0.14-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/03747a67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/03747a67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/03747a67
Branch: refs/heads/0.14-dev
Commit: 03747a67c5d9f19a0a2bb8c8785bf9835aebbfc6
Parents: 2242b73 64b77b1
Author: acton393 <zh...@gmail.com>
Authored: Tue Jun 13 15:23:38 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Jun 13 15:23:38 2017 +0800
----------------------------------------------------------------------
.travis.yml | 5 +++++
.../Sources/Component/WXCycleSliderComponent.m | 7 ++++---
package.json | 2 +-
test/pages/css/border.vue | 15 +++++++++------
test/run.sh | 4 +++-
test/scripts/util.js | 5 +++--
test/serve.sh | 3 ++-
7 files changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------