Merge branch 'master' into jg-test-ui

2016-12-09 13:36:50 +01:00 · 2016-12-09 13:36:50 +01:00 · 00c53a8d18
parent bb209424ac 83f791fa5d
commit 00c53a8d18
2 changed files with 2 additions and 2 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1271,7 +1271,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#f5365b857b006ed60c02eb9360d60d7ddef65104"
+source = "git+https://github.com/ethcore/js-precompiled.git#1bf7160f6c8f25353d790dbd0935560d3d395727"
 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.100",
+  "version": "0.2.102",
  "main": "release/index.js",
  "jsnext:main": "src/index.js",
  "author": "Parity Team <admin@parity.io>",