Merge remote-tracking branch 'upstream/development' into sol-doc

2018-09-26 09:19:02 -04:00
parent 0ce6f03ed5 13aa98f0f3
commit 75826fd559
89 changed files with 617 additions and 258 deletions
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1537541580,
        "version": "2.0.1",
--- a/packages/typescript-typings/CHANGELOG.md
+++ b/packages/typescript-typings/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v2.0.2 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.0.1 - _September 21, 2018_

    * Dependencies updated
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0xproject/typescript-typings",
-    "version": "2.0.1",
+    "version": "2.0.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -26,7 +26,7 @@
        "@types/bn.js": "^4.11.0",
        "@types/react": "*",
        "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
        "popper.js": "1.14.3"
    },
    "devDependencies": {