Merge branch 'master' into develop

iurimatias · iurimatias · commit 3eb53ee6afc3 · 2017-07-26T07:35:57.000-04:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = u'2.5'
 # The full version, including alpha/beta/rc tags.
-release = u'2.5.1'
+release = u'2.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "embark",`
`3`		`- "version": "2.5.1",`
	`3`	`+ "version": "2.5.2",`
`4`	`4`	`"description": "Embark is a framework that allows you to easily develop and deploy DApps",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "grunt jshint && mocha test/ --no-timeouts"`