Merge development

3 files changed, 49 insertions, 21 deletions

diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json
index 0fd8833c9..6fbe3712a 100644
--- a/contracts/multisig/CHANGELOG.json
+++ b/contracts/multisig/CHANGELOG.json
@@ -1,14 +1,19 @@
 [
     {
-        "version": "3.0.0",
+        "version": "2.0.2",
         "changes": [
             {
-                "note": "Add AssetProxyOwner contract",
-                "pr": 1539
-            },
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "2.0.1",
+        "changes": [
             {
-                "note": "Rename multisig directory to src",
-                "pr": 1539
+                "note": "Dependencies updated"
             }
         ]
     },
@@ -18,8 +23,17 @@
             {
                 "note": "Upgrade the bignumber.js to v8.0.2",
                 "pr": 1517
+            },
+            {
+                "note": "Add AssetProxyOwner contract",
+                "pr": 1539
+            },
+            {
+                "note": "Rename multisig directory to src",
+                "pr": 1539
             }
-        ]
+        ],
+        "timestamp": 1549373905
     },
     {
         "timestamp": 1547747677,
diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md
index 59d0804da..7426c18c3 100644
--- a/contracts/multisig/CHANGELOG.md
+++ b/contracts/multisig/CHANGELOG.md
@@ -5,6 +5,20 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.2 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v2.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v2.0.0 - _February 5, 2019_
+
+    * Upgrade the bignumber.js to v8.0.2 (#1517)
+    * Add AssetProxyOwner contract (#1539)
+    * Rename multisig directory to src (#1539)
+
 ## v1.0.6 - _January 17, 2019_
 
     * Dependencies updated
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index c5cc8ef25..d6e5989cd 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "1.0.6",
+    "version": "2.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,12 +46,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.22",
-        "@0x/contracts-test-utils": "^2.0.1",
-        "@0x/dev-utils": "^1.0.24",
-        "@0x/sol-compiler": "^2.0.2",
-        "@0x/tslint-config": "^2.0.2",
         "@0x/contracts-gen": "^1.0.0",
+        "@0x/abi-gen": "^2.0.1",
+        "@0x/contracts-test-utils": "^3.0.2",
+        "@0x/dev-utils": "^2.0.1",
+        "@0x/sol-compiler": "^3.0.1",
+        "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
         "chai": "^4.0.1",
@@ -67,14 +67,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-asset-proxy": "1.0.0",
-        "@0x/contracts-erc20": "1.0.0",
-        "@0x/types": "^1.5.2",
-        "@0x/typescript-typings": "^3.0.8",
-        "@0x/utils": "^3.0.1",
-        "@0x/web3-wrapper": "^3.2.4",
-        "ethereum-types": "^1.1.6",
+        "@0x/base-contract": "^4.0.1",
+        "@0x/contracts-asset-proxy": "^1.0.3",
+        "@0x/contracts-erc20": "^1.0.3",
+        "@0x/types": "^2.0.1",
+        "@0x/typescript-typings": "^4.0.0",
+        "@0x/utils": "^4.0.2",
+        "@0x/web3-wrapper": "^4.0.1",
+        "ethereum-types": "^2.0.0",
         "lodash": "^4.17.5"
     },
     "publishConfig": {