Merge remote-tracking branch 'origin/master' into hotfix/waterfall

2017-02-27 10:35:19 +08:00
parent 787ff255b8 a8bbc42cda
commit 7d95d626a5
91 changed files with 939 additions and 268 deletions
@@ -10,5 +10,8 @@
  "dialog": "./packages/dialog/index.js",
  "picker": "./packages/picker/index.js",
  "radio-group": "./packages/radio-group/index.js",
-  "waterfall": "./packages/waterfall/index.js"
+  "waterfall": "./packages/waterfall/index.js",
+  "loading": "./packages/loading/index.js",
+  "panel": "./packages/panel/index.js",
+  "card": "./packages/card/index.js"
 }