Merge develop (#1242)

* remove duplicate line (#1086) (#1098) * Align text for unitMap (#1127) * fixing compiler errors (#1174) * Added web3j-scala to the list of Other Implementations (#1206) * Extends HttpProvider with custom http headers (#1228) * extend HttpProvider with custom http headers * reset formatting * reset formatting * reset formatting * fix null object * fix null object * Adds checksum isAddress() test cases (#1224) * fixed tests * build files
web3 · Dec 21, 2017 · e4d94a2 · e4d94a2
1 parent 64c932c
commit e4d94a2
Show file tree

Hide file tree

Showing 13 changed files with 2,784 additions and 2,799 deletions.
diff --git a/README.md b/README.md
@@ -130,6 +130,7 @@ npm test
  - Python [Web3.py](https://github.com/pipermerriam/web3.py)
  - Haskell [hs-web3](https://github.com/airalab/hs-web3)
  - Java [web3j](https://github.com/web3j/web3j)
+ - Scala [web3j-scala](https://github.com/mslinn/web3j-scala)
 
 
 [npm-image]: https://badge.fury.io/js/web3.png

diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js