Gustavo Cortez 88a7fca8d8 Fix Conflicts: ... js/controllers/signin.js		2014-05-06 18:12:24 -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-06 18:12:24 -03:00
network	STUN/TURN in default config	2014-05-05 15:54:17 -03:00
storage	Fix signing when put a wrong password. Fixes #297	2014-05-06 17:57:16 -03:00