Merge branch 'develop'

This commit is contained in:
Iuri Matias 2015-07-31 19:29:34 -04:00
commit ddc134a914
4 changed files with 5 additions and 5 deletions

View File

@ -15,7 +15,7 @@ See the [Wiki](https://github.com/iurimatias/embark-framework/wiki) for more det
Installation Installation
====== ======
Requirements: geth (0.9.38), solc (0.9.23), node (0.12.2) and npm Requirements: geth (1.0.0), solc (0.9.23), node (0.12.2) and npm
For specs: pyethereum, ethertdd.py For specs: pyethereum, ethertdd.py

View File

@ -25,7 +25,7 @@ var deploy = function(env, embarkConfig) {
} }
program program
.version('0.7.1') .version('0.7.2')
program.command('new [name]').description('New application').action(function(name) { program.command('new [name]').description('New application').action(function(name) {
if (name === undefined) { if (name === undefined) {

View File

@ -10,7 +10,7 @@
"license": "ISC", "license": "ISC",
"homepage": "", "homepage": "",
"devDependencies": { "devDependencies": {
"embark-framework": "^0.7.1", "embark-framework": "^0.7.2",
"grunt-embark": "^0.2.0", "grunt-embark": "^0.2.0",
"grunt-contrib-clean": "^0.6.0", "grunt-contrib-clean": "^0.6.0",
"grunt-contrib-coffee": "^0.13.0", "grunt-contrib-coffee": "^0.13.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "embark-framework", "name": "embark-framework",
"version": "0.7.1", "version": "0.7.2",
"description": "", "description": "",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
@ -23,7 +23,7 @@
"python": "^0.0.4", "python": "^0.0.4",
"read-yaml": "^1.0.0", "read-yaml": "^1.0.0",
"shelljs": "^0.5.0", "shelljs": "^0.5.0",
"sleep": "^2.0.0", "sleep": "^3.0.0",
"sync-me": "^0.1.1", "sync-me": "^0.1.1",
"toposort": "^0.2.10", "toposort": "^0.2.10",
"web3": "^0.8.1", "web3": "^0.8.1",