Fix Conflicts:

js/controllers/signin.js
This commit is contained in:
Gustavo Cortez 2014-05-06 18:12:24 -03:00
commit 88a7fca8d8
12 changed files with 295 additions and 115 deletions

View file

@ -65,6 +65,8 @@ WalletFactory.prototype.fromObj = function(obj) {
}
this.log('### WALLET OPENED:', w.id);
// store imported wallet
w.store();
return w;
};