Merge remote-tracking branch 'origin/master'

gczhou · Jan 16, 2018 · 12ebd90 · 12ebd90
2 parents 2ac2fbd + a2d1e04
commit 12ebd90
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/js-old/scripts/test.js b/js-old/scripts/test.js
@@ -1 +1 @@
-// test script 28
+// test script 29
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Parity",
-  "version": "1.9.54",
+  "version": "1.9.55",
   "main": "src/index.parity.js",
   "jsnext:main": "src/index.parity.js",
   "author": "Parity Team <[email protected]>",

diff --git a/js/scripts/test.js b/js/scripts/test.js
@@ -1 +1 @@
-// test script 34
+// test script 35