Skip to content

Commit ddc134a

Browse files
committed
Merge branch 'develop'
2 parents 7661e8c + dfdb917 commit ddc134a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ See the [Wiki](https://github.com/iurimatias/embark-framework/wiki) for more det
1515

1616
Installation
1717
======
18-
Requirements: geth (0.9.38), solc (0.9.23), node (0.12.2) and npm
18+
Requirements: geth (1.0.0), solc (0.9.23), node (0.12.2) and npm
1919

2020
For specs: pyethereum, ethertdd.py
2121

bin/embark

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var deploy = function(env, embarkConfig) {
2525
}
2626

2727
program
28-
.version('0.7.1')
28+
.version('0.7.2')
2929

3030
program.command('new [name]').description('New application').action(function(name) {
3131
if (name === undefined) {

boilerplate/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "ISC",
1111
"homepage": "",
1212
"devDependencies": {
13-
"embark-framework": "^0.7.1",
13+
"embark-framework": "^0.7.2",
1414
"grunt-embark": "^0.2.0",
1515
"grunt-contrib-clean": "^0.6.0",
1616
"grunt-contrib-coffee": "^0.13.0",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "embark-framework",
3-
"version": "0.7.1",
3+
"version": "0.7.2",
44
"description": "",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1"
@@ -23,7 +23,7 @@
2323
"python": "^0.0.4",
2424
"read-yaml": "^1.0.0",
2525
"shelljs": "^0.5.0",
26-
"sleep": "^2.0.0",
26+
"sleep": "^3.0.0",
2727
"sync-me": "^0.1.1",
2828
"toposort": "^0.2.10",
2929
"web3": "^0.8.1",

0 commit comments

Comments
 (0)