merge development

2018-05-21 13:38:12 -07:00
parent c70540e7f4 a26cc7c14d
commit 0fdf32cf6f
87 changed files with 125 additions and 45 deletions
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -2,7 +2,7 @@
    "name": "@0xproject/react-shared",
    "version": "0.1.6",
    "engines": {
-        "node" : ">=6.12"
+        "node": ">=6.12"
    },
    "description": "0x shared react components",
    "main": "lib/index.js",
@@ -29,6 +29,7 @@
        "@0xproject/monorepo-scripts": "^0.1.19",
        "@0xproject/tslint-config": "^0.4.17",
        "copyfiles": "^1.2.0",
+        "make-promises-safe": "^1.1.0",
        "shx": "^0.2.2",
        "tslint": "^5.9.1",
        "typescript": "2.7.1"