anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix Conflicts:

Browse source 
js/controllers/join.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:55:44 -03:00
commit fd030ecbfb
5 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/controllers/setup.js
View file

@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('SetupController',
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
controllerUtils.redirIfLogged();
$rootScope.fromSetup = true;
$rootScope.videoInfo = {};
$scope.loading = false;
$scope.walletPassword = $rootScope.walletPassword;