Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into disable-verbose
Browse files Browse the repository at this point in the history
  • Loading branch information
gavofyork committed Oct 31, 2016
2 parents bffdee1 + c2c7585 commit 1894722
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "0.1.7",
"version": "0.1.9",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",
Expand Down

0 comments on commit 1894722

Please sign in to comment.