Merge branch '1.x' into ws-agent-support

Author: nivida

.travis.yml

@@ -3,6 +3,7 @@ node_js:
     - "8"
     - "10"
     - "11"
+    - "12"
 env:
     - CXX=g++-4.8
 addons:
@@ -21,4 +22,3 @@ script:
     - npm run-script test-coveralls
 after_script:
     - cd test/node && npm install && node app.js
-

README.md

@@ -160,7 +160,7 @@ npm test
 
 
 [repo]: https://github.com/ethereum/web3.js
-[docs]: http://web3js.readthedocs.io/en/1.0/
+[docs]: http://web3js.readthedocs.io/
 [npm-image]: https://badge.fury.io/js/web3.png
 [npm-url]: https://npmjs.org/package/web3
 [travis-image]: https://travis-ci.org/ethereum/web3.js.svg
@@ -170,6 +170,6 @@ npm test
 [dep-dev-image]: https://david-dm.org/ethereum/web3.js/dev-status.svg
 [dep-dev-url]: https://david-dm.org/ethereum/web3.js#info=devDependencies
 [coveralls-image]: https://coveralls.io/repos/ethereum/web3.js/badge.svg?branch=master
-[coveralls-url]: https://coveralls.io/r/ethereum/web3.js?branch=master
+[coveralls-url]: https://coveralls.io/r/ethereum/web3.js?branch=1.x
 [waffle-image]: https://badge.waffle.io/ethereum/web3.js.svg?label=ready&title=Ready
 [waffle-url]: https://waffle.io/ethereum/web3.js

bower.json

@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [