merge: master

2017-03-15 10:50:19 +08:00
parent b235b9ac7b 72ab1fe73b
commit b653859f61
43 changed files with 785 additions and 36 deletions
@@ -31,6 +31,8 @@
  "actionsheet": "./packages/actionsheet/index.js",
  "quantity": "./packages/quantity/index.js",
  "progress": "./packages/progress/index.js",
-  "uploader": "./packages/uploader/index.js"
+  "uploader": "./packages/uploader/index.js",
+  "swipe": "./packages/swipe/index.js",
+  "swipe-item": "./packages/swipe-item/index.js"

 }