status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
137 Commits 27 Branches 52 Tags 24 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Marek Kotewicz f6ff1f18b8 mocha reporter name starts with lower case letter 2015-01-13 11:21:58 +01:00
Gav Wood ded221fba2 Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop 
Conflicts:
	libjsqrc/ethereumjs/.travis.yml
	libjsqrc/ethereumjs/README.md
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/lib/abi.js
	libjsqrc/ethereumjs/package.json
 2015-01-11 17:54:36 +01:00