Gustavo Cortez 47dcc12910 Fix Conflicts: ... js/models/core/Wallet.js		2014-06-19 16:43:34 -03:00
..
AddressIndex.js	Add wallet addresses index discovery on importing backup	2014-06-18 11:10:51 -03:00
Passphrase.js
PrivateKey.js	trying to fix tests	2014-06-12 14:36:00 -03:00
PublicKeyRing.js	Add wallet addresses index discovery on importing backup	2014-06-18 11:10:51 -03:00
Structure.js
TxProposals.js	all tests passing	2014-06-19 15:57:38 -03:00
Wallet.js	Fix Conflicts:	2014-06-19 16:43:34 -03:00
WalletFactory.js	Fix Conflicts:	2014-06-19 16:43:34 -03:00