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

..

browser-bn.js

fixes for go otto env

2015-03-23 17:56:57 +01:00

config.js

improved async polling

2015-06-08 14:38:16 +02:00

sha3.js

sha3 backward compatibility. #205

2015-05-26 20:47:04 +02:00

utils.js

Merge branch 'develop' into strings

2015-06-03 17:19:24 +02:00