Gustavo Cortez 2454d930fa Merge branch 'master' into feature/socket-io-support ... Fix conflicts: js/app.js js/controllers/signin.js		2014-04-17 11:58:11 -03:00
..
PrivateKey.js	architecture refactor	2014-04-14 15:39:02 -03:00
PublicKeyRing.js	fix mocha testing!	2014-04-15 18:47:16 -03:00
TxProposals.js	fix mocha testing!	2014-04-15 18:47:16 -03:00
Wallet.js	Merge branch 'master' into feature/socket-io-support	2014-04-17 11:58:11 -03:00
WalletFactory.js	fix uxrefresh with new #setup	2014-04-17 11:46:49 -03:00