Merge remote-tracking branch 'origin/master' into check-updates

This commit is contained in:
Gav Wood
2016-12-13 17:26:09 +01:00
25 changed files with 61 additions and 407 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "0.2.120",
"version": "0.2.121",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",