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": "1.5.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "1.5.0",
|
||||
"changes": [
|
||||
|
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.5.1 - _March 3, 2020_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.5.0 - _February 27, 2020_
|
||||
|
||||
* Add generic liquidity provider sampling (#2487)
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-erc20-bridge-sampler",
|
||||
"version": "1.5.0",
|
||||
"version": "1.5.1",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -51,13 +51,13 @@
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
|
||||
"devDependencies": {
|
||||
"@0x/abi-gen": "^5.2.2",
|
||||
"@0x/contracts-asset-proxy": "^3.2.4",
|
||||
"@0x/contracts-erc20": "^3.1.4",
|
||||
"@0x/contracts-exchange": "^3.2.4",
|
||||
"@0x/contracts-exchange-libs": "^4.3.4",
|
||||
"@0x/contracts-asset-proxy": "^3.2.5",
|
||||
"@0x/contracts-erc20": "^3.1.5",
|
||||
"@0x/contracts-exchange": "^3.2.5",
|
||||
"@0x/contracts-exchange-libs": "^4.3.5",
|
||||
"@0x/contracts-gen": "^2.0.8",
|
||||
"@0x/contracts-test-utils": "^5.3.1",
|
||||
"@0x/contracts-utils": "^4.4.2",
|
||||
"@0x/contracts-test-utils": "^5.3.2",
|
||||
"@0x/contracts-utils": "^4.4.3",
|
||||
"@0x/dev-utils": "^3.2.1",
|
||||
"@0x/sol-compiler": "^4.0.8",
|
||||
"@0x/tslint-config": "^4.0.0",
|
||||
|
Reference in New Issue
Block a user