Mario Colque 2c0b733025 fix conflicts		2014-04-17 18:05:26 -03:00
..
blockchain	Refactory get balance 's methods	2014-04-17 16:42:27 -03:00
core	fix conflicts	2014-04-17 18:05:26 -03:00
network	clean config for peerjs	2014-04-17 17:10:32 -03:00
storage	fix walletID list	2014-04-17 13:43:42 -03:00