Marek Kotewicz 4482d5bf00 Merge branch 'develop' into events_refactor ...

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
	lib/web3/filter.js

2015-04-22 09:28:56 +02:00

..

browser-bn.js

fixes for go otto env

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

browser-xhr.js

fix for otto

2015-03-23 18:10:07 +01:00

config.js

web3.eth.defaultAccount property, updated event_inc example, fixed #96

2015-04-20 14:16:29 +02:00

utils.js

Merge branch 'develop' into events_refactor

2015-04-22 09:28:56 +02:00