Merge branch 'master' into feature/contract-directories2

8 years ago · a8bc98848c
parent 3fa1afaffd 13aba8aab5
commit a8bc98848c
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
    "test": "test"
  },
  "scripts": {
-    "test": "mocha --timeout 10000"
+    "test": "mocha --timeout 15000"
  },
  "author": "",
  "license": "ISC",
@ -17,7 +17,7 @@
    "mkdirp": "^0.5.1",
    "shelljs": "^0.7.4",
    "sol-explore": "^1.6.2",
-    "solidity-parser": "git+https://github.com/ConsenSys/solidity-parser.git#master"
+    "solidity-parser": "^0.2.0"
  },
  "devDependencies": {
    "crypto-js": "^3.1.9-1",