Merge branch 'development' into fix/expiration-watcher

* development:
  Publish
  Updated CHANGELOGS
  Move @0xproject/migrations to devDependencies
  Publish
  Updated CHANGELOGS
  Make @0xproject/migrations public

# Conflicts:
#	packages/0x.js/CHANGELOG.json
#	packages/0x.js/package.json
This commit is contained in:
Fabio Berger
2018-04-19 10:38:43 +09:00
12 changed files with 148 additions and 75 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.36.1",
"version": "0.36.3",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -63,6 +63,7 @@
"devDependencies": {
"@0xproject/deployer": "^0.4.1",
"@0xproject/dev-utils": "^0.3.6",
"@0xproject/migrations": "^0.0.3",
"@0xproject/monorepo-scripts": "^0.1.18",
"@0xproject/subproviders": "^0.9.0",
"@0xproject/tslint-config": "^0.4.16",
@@ -114,9 +115,6 @@
"uuid": "^3.1.0",
"web3": "^0.20.0"
},
"optionalDependencies": {
"@0xproject/migrations": "^0.0.2"
},
"publishConfig": {
"access": "public"
}