Merge branch 'master' into trie-iterative

openethereum · Dec 29, 2016 · dcf7881 · dcf7881
2 parents d2971d5 + 486f7ae
commit dcf7881
Show file tree

Hide file tree

Showing 26 changed files with 1,282 additions and 579 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.152",
+  "version": "0.2.154",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <[email protected]>",