Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
* '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex: * [ios] fix scan history tap gesture conflict * [test] add dingding bot Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b4c68c65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b4c68c65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b4c68c65 Branch: refs/heads/0.13-dev Commit: b4c68c6570740233c26aa02ee36cc9c755f4471e Parents: 61fe03a 9d2a828 Author: zshshr <zhengshihan...@gmail.com> Authored: Tue May 2 16:25:59 2017 +0800 Committer: zshshr <zhengshihan...@gmail.com> Committed: Tue May 2 16:25:59 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 2 ++ .../WeexDemo/Scanner/WXScannerHistoryVC.m | 25 ++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
