aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-02-27 10:12:11 +0800
committerJacob Evans <jacob@dekz.net>2018-02-27 10:47:09 +0800
commit6961169f89c4cd8480aca9c720cd8299aec9bbc0 (patch)
tree51b9a6a2f0dbaee50a9758a7983fe201d5898354 /packages/web3-wrapper
parent3d66feb89f8e4cfcb0b5251a96d02ef31f3ae34b (diff)
parent709fa9e02ec21cee9fc145b4a578742c8dd190aa (diff)
downloaddexon-sol-tools-6961169f89c4cd8480aca9c720cd8299aec9bbc0.tar.gz
dexon-sol-tools-6961169f89c4cd8480aca9c720cd8299aec9bbc0.tar.zst
dexon-sol-tools-6961169f89c4cd8480aca9c720cd8299aec9bbc0.zip
Merge branch 'development' into feature/0x.js/lowercase-addresses
Diffstat (limited to 'packages/web3-wrapper')
-rw-r--r--packages/web3-wrapper/CHANGELOG.md2
-rw-r--r--packages/web3-wrapper/package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md
index e51366e6f..387aafb3a 100644
--- a/packages/web3-wrapper/CHANGELOG.md
+++ b/packages/web3-wrapper/CHANGELOG.md
@@ -4,6 +4,6 @@
* Ensure all returned user addresses are lowercase (#373)
-## v0.1.12 - _February 9, 2018_
+## v0.1.12 - _February 9, 2018_
* Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 8e861b1d5..8f87bb118 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -21,7 +21,6 @@
"homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.9",
- "@0xproject/types": "^0.2.3",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -30,6 +29,7 @@
"web3-typescript-typings": "^0.9.11"
},
"dependencies": {
+ "@0xproject/types": "^0.2.3",
"@0xproject/utils": "^0.3.4",
"lodash": "^4.17.4",
"web3": "^0.20.0"