merge: merge master

2017-03-15 16:31:00 +08:00
parent 98071b8634 c757c9fc4b
commit c515965358
50 changed files with 979 additions and 58 deletions
@@ -31,5 +31,8 @@
  "actionsheet": "./packages/actionsheet/index.js",
  "quantity": "./packages/quantity/index.js",
  "progress": "./packages/progress/index.js",
-  "toast": "./packages/toast/index.js"
+  "toast": "./packages/toast/index.js",
+  "uploader": "./packages/uploader/index.js",
+  "swipe": "./packages/swipe/index.js",
+  "swipe-item": "./packages/swipe-item/index.js"
 }