Merge branch 'master' into hotfix/switch_loading_fix

This commit is contained in:
jiangruowei
2017-03-01 17:04:54 +08:00
120 changed files with 50427 additions and 11015 deletions

View File

@@ -1,5 +1,5 @@
{
"name": "@youzan/z-loading",
"name": "@youzan/zan-loading",
"version": "0.0.1",
"description": "loading component",
"main": "./lib/index.js",