Merge remote-tracking branch 'upstream/pr1018' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6019278e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6019278e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6019278e Branch: refs/heads/master Commit: 6019278eae6d768bbadf1cb670e00410fda12a62 Parents: b6b2c24 e69b8c6 Author: misakuo <misa...@apache.org> Authored: Thu Feb 8 16:55:25 2018 +0800 Committer: misakuo <misa...@apache.org> Committed: Thu Feb 8 16:55:25 2018 +0800 ---------------------------------------------------------------------- .../src/main/java/com/taobao/weex/utils/BoxShadowUtil.java | 2 +- test/pages/css/border.vue | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
