embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release/2.6.0' into develop

This commit is contained in:
Iuri Matias 2017-12-13 12:17:29 -05:00
parent 58cf9ca78d 97231caad8
commit aa0f774f1d
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ test_app/chains.json
.idea .idea
.eslintrc.json .eslintrc.json
.embark/ .embark/
NOTES

2
lib/contracts/code_templates/define-web3-simple.js.ejs
View File

@ -1,3 +1,3 @@
__mainContext.web3 = undefined; __mainContext.web3 = undefined;
web3 = new Web3(new Web3.providers.HttpProvider("<%- url -%>'")); web3 = new Web3(new Web3.providers.HttpProvider("<%- url -%>"));
<%- done %> <%- done %>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "embark", "name": "embark",
"version": "2.6.0", "version": "2.6.1",
"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 && cd test_app/ && npm install && ../bin/embark test", "test": "grunt jshint && mocha test/ --no-timeouts && cd test_app/ && npm install && ../bin/embark test",