aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper/CHANGELOG.json
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-19 16:48:00 +0800
committerFabio Berger <me@fabioberger.com>2018-06-19 17:16:30 +0800
commit2a4456b9cae6515d0210e3a2aa4b511c0262849c (patch)
tree2c34a6e860378164470ab0562120d6f285918f9b /packages/web3-wrapper/CHANGELOG.json
parent0bfcf79e79b762a9fb98e90b8e6310c781cfae97 (diff)
downloaddexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar.gz
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar.bz2
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar.lz
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar.xz
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.tar.zst
dexon-sol-tools-2a4456b9cae6515d0210e3a2aa4b511c0262849c.zip
Update CHANGELOG's with publishes performed on development branch
Diffstat (limited to 'packages/web3-wrapper/CHANGELOG.json')
-rw-r--r--packages/web3-wrapper/CHANGELOG.json13
1 files changed, 13 insertions, 0 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index bd4bf06dd..1f1c8e2c0 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,5 +1,18 @@
[
{
+<<<<<<< HEAD
+=======
+ "timestamp": 1529397769,
+ "version": "0.7.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1528070400,
+>>>>>>> 40a061a5... Updated CHANGELOGS
"version": "0.7.0",
"changes": [
{