Fix Conflicts:

views/unsupported.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:51:04 -03:00
commit 0c2141c380
53 changed files with 1983 additions and 1297 deletions

View file

@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('OpenController',
};
$scope.loading = false;
$scope.wallets = walletFactory.getWallets().sort(cmp);
$scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null;
$scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id);
$scope.openPassword = '';
$scope.open = function(form) {