Marek Kotewicz 390a9ff933 Merge branch 'develop' into strings ...

Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js

2015-06-25 12:12:39 +02:00

..

solidity

abi string type, fixes #216, #218, #219

2015-06-01 19:50:45 +02:00

utils

Merge branch 'develop' into strings

2015-06-25 12:12:39 +02:00

web3

Merge branch 'develop' into allevents

2015-06-24 12:10:46 +02:00

version.json

version 0.6.1

2015-06-23 16:23:36 +02:00

web3.js

fixed all issues noted by marek

2015-06-24 11:49:10 +02:00