152 Commits

Author SHA1 Message Date
Marek Kotewicz
9c2c94668f Merge branch 'web3' into develop
Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-10 00:08:07 +02:00
Marek Kotewicz
73b9ed29c0 rename to web3 2015-04-07 04:39:47 +02:00