aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-addresses
diff options
context:
space:
mode:
authorFred Carlsen <fred@sjelfull.no>2018-11-27 23:19:36 +0800
committerFred Carlsen <fred@sjelfull.no>2018-11-27 23:19:36 +0800
commit9b0020a884bdb98f9da434878fec171ab533ba7e (patch)
treeca285eb7dfd2c68f781b8b74d409fb69665a58dc /packages/contract-addresses
parentec12e46e3f52ebb44338c113cecd073979821fae (diff)
parentfdc4a4e5fa31d8797abf6313f4488147853ed77e (diff)
downloaddexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.gz
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.bz2
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.lz
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.xz
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.zst
dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.zip
Merge remote-tracking branch 'upstream/development' into website
Diffstat (limited to 'packages/contract-addresses')
-rw-r--r--packages/contract-addresses/CHANGELOG.json3
-rw-r--r--packages/contract-addresses/CHANGELOG.md4
-rw-r--r--packages/contract-addresses/package.json2
3 files changed, 7 insertions, 2 deletions
diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
index 86c6a5c31..e65351c7e 100644
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -5,7 +5,8 @@
{
"note": "Rinkeby Deployment"
}
- ]
+ ],
+ "timestamp": 1542821676
},
{
"version": "1.1.0",
diff --git a/packages/contract-addresses/CHANGELOG.md b/packages/contract-addresses/CHANGELOG.md
index 20e52cd8b..9801831f7 100644
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.2.0 - _November 21, 2018_
+
+ * Rinkeby Deployment
+
## v1.1.0 - _November 9, 2018_
* Update Forwarder addresses (#1192)
diff --git a/packages/contract-addresses/package.json b/packages/contract-addresses/package.json
index 47258edef..9f0db4d30 100644
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contract-addresses",
- "version": "1.1.0",
+ "version": "1.2.0",
"engines": {
"node": ">=6.12"
},