Merge branch 'master' into develop

gnidan · gnidan · commit 8c6cc5ccf980 · 2017-12-14T18:12:01.000-05:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "truffle-core",
   "namespace": "consensys",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Core code for Truffle command line tool",
   "dependencies": {
     "async": "^1.4.2",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "truffle-core",`
`3`	`3`	`"namespace": "consensys",`
`4`		`- "version": "4.0.2",`
	`4`	`+ "version": "4.0.3",`
`5`	`5`	`"description": "Core code for Truffle command line tool",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"async": "^1.4.2",`