Commit 59cc2a5d79adce2a9ce41c522b086bee196c3cc7
Merge branch 'master' into refractor_async_testing
wanderer committed on 11/22/2016, 2:09:06 AMParent: 2229ecba408cfd0e6ff15bcdbdce4e5324729188
Parent: c8eec344b7def6dcff0d4682d181e6324d80b6b8
Files changed
package.json | changed |
package.json | ||
---|---|---|
@@ -24,9 +24,9 @@ | ||
24 | 24 | "author": "mjbecze <mjbecze@gmail.com>", |
25 | 25 | "contributors": "Alex Beregszaszi <alex@rtfs.hu>", |
26 | 26 | "license": "MPL-2.0", |
27 | 27 | "devDependencies": { |
28 | - "standard": "^7.1.2", | |
28 | + "standard": "^8.5.0", | |
29 | 29 | "tape": "^4.5.1" |
30 | 30 | }, |
31 | 31 | "standard": { |
32 | 32 | "ignore": [ |
@@ -39,8 +39,8 @@ | ||
39 | 39 | "dependencies": { |
40 | 40 | "bn.js": "^4.11.6", |
41 | 41 | "ethereumjs-block": "^1.2.2", |
42 | 42 | "ethereumjs-tx": "^1.1.2", |
43 | - "ethereumjs-util": "^4.5.0", | |
44 | - "merkle-trie": "0.0.0" | |
43 | + "merkle-trie": "0.0.0", | |
44 | + "ethereumjs-util": "^5.0.0" | |
45 | 45 | } |
46 | 46 | } |
Built with git-ssb-web