Merge branch 'development' of github.com:0xProject/0x-monorepo into feature/plp-integration
# Conflicts: # packages/asset-swapper/package.json # packages/asset-swapper/src/utils/market_operation_utils/sampler.ts # packages/asset-swapper/src/utils/market_operation_utils/types.ts # packages/asset-swapper/test/market_operation_utils_test.ts
This commit is contained in:
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1583220306,
|
||||
"version": "13.6.3",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1582837861,
|
||||
"version": "13.6.2",
|
||||
|
||||
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v13.6.3 - _March 3, 2020_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v13.6.2 - _February 27, 2020_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contract-wrappers",
|
||||
"version": "13.6.2",
|
||||
"version": "13.6.3",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -52,7 +52,7 @@
|
||||
"dependencies": {
|
||||
"@0x/assert": "^3.0.7",
|
||||
"@0x/base-contract": "^6.2.1",
|
||||
"@0x/contract-addresses": "^4.8.0",
|
||||
"@0x/contract-addresses": "^4.9.0",
|
||||
"@0x/json-schemas": "^5.0.7",
|
||||
"@0x/types": "^3.1.2",
|
||||
"@0x/utils": "^5.4.1",
|
||||
|
||||
Reference in New Issue
Block a user