Matias Alejo Garcia 84637bd12d fix conflicts		2014-05-01 11:04:21 -03:00
..
blockchain	Get transactions of all addresses (the generated and the changes). Do not repeat txids on the front-end	2014-04-23 03:37:17 -03:00
core	fix conflicts	2014-05-01 11:04:21 -03:00
network	fix "hello" for authenticated peers	2014-04-30 14:28:33 -03:00
storage	add wallets nicknames, handle error messages	2014-04-24 16:36:15 -03:00