Merge branch 'master' into ui-2

2017-05-09 14:10:24 +02:00 · 2017-05-09 14:10:24 +02:00 · 9f91c0490c
parent 40744d1bd2 518b6e647b
commit 9f91c0490c
2 changed files with 2 additions and 2 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1781,7 +1781,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#0826776d9190ee6945bfe481e10b19ec05b3a049"
+source = "git+https://github.com/paritytech/js-precompiled.git#cff0aec1877a4b75f51de3facee9fe439a41a90d"
 dependencies = [
 "parity-dapps-glue 1.7.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": "1.7.69",
+  "version": "1.7.70",
  "main": "release/index.js",
  "jsnext:main": "src/index.js",
  "author": "Parity Team <admin@parity.io>",