Gustavo Cortez e17aed54b0 Fix conflicts: ... js/controllers/transactions.js		2014-04-23 15:10:42 -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	reject button working	2014-04-23 02:01:54 -03:00
network	small fixes	2014-04-22 22:07:44 -03:00
storage	get LocalEncrypted working the same way as File	2014-04-18 19:19:38 -03:00