Merge branch 'master' of github.com:bitpay/copay into feature/copay-shell

This commit is contained in:
Gordon Hall 2014-06-04 10:16:39 -04:00
commit 60cda70f72
38 changed files with 108 additions and 258 deletions

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copay.import').controller('ImportController',
angular.module('copayApp.controllers').controller('ImportController',
function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) {
$scope.title = 'Import a backup';
var reader = new FileReader();