Merge remote-tracking branch 'origin/master' into fix-tx-rpc

2016-12-01 06:31:09 -08:00 · 2016-12-01 06:31:09 -08:00 · f77a9aa007
commit f77a9aa007
parent d3e684698a 0f987a2206
2 changed files with 2 additions and 2 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#b3f0e3ddedf9afee35ca8384a74158df572973c7"
+source = "git+https://github.com/ethcore/js-precompiled.git#d99369b5010cfa73c3a62eb8c031bf873a7ca709"
 dependencies = [
 "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "parity.js",
-  "version": "0.2.80",
+  "version": "0.2.82",
  "main": "release/index.js",
  "jsnext:main": "src/index.js",
  "author": "Parity Team <admin@parity.io>",