status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Iuri Matias 2017-07-26 07:35:57 -04:00
parent 29c343463b bc2c6b637c
commit 3eb53ee6af
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/conf.py
View File

@ -60,7 +60,7 @@ author = u'Iuri Matias'
# The short X.Y version. # The short X.Y version.
version = u'2.5' version = u'2.5'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "embark", "name": "embark",
"version": "2.5.1", "version": "2.5.2",
"description": "Embark is a framework that allows you to easily develop and deploy DApps", "description": "Embark is a framework that allows you to easily develop and deploy DApps",
"scripts": { "scripts": {
"test": "grunt jshint && mocha test/ --no-timeouts" "test": "grunt jshint && mocha test/ --no-timeouts"