Merge pull request #5408 from cmgustavo/bug/qr-scanner-01

Fix QR scanner from directive
This commit is contained in:
Javier Donadío 2017-01-06 17:20:06 -03:00 committed by GitHub
commit e244290285
4 changed files with 13 additions and 6 deletions

View file

@ -336,7 +336,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/import',
views: {
'tab-home@tabs': {
templateUrl: 'views/import.html'
templateUrl: 'views/import.html',
controller: 'importController'
},
},
})
@ -787,7 +788,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/import',
views: {
'onboarding': {
templateUrl: 'views/import.html'
templateUrl: 'views/import.html',
controller: 'importController'
},
},
params: {