Fixed Conflicts:

index.html
This commit is contained in:
Gustavo Cortez 2014-06-03 18:49:25 -03:00
commit 5a0c1e235b
33 changed files with 322 additions and 202 deletions

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copay.transactions').controller('TransactionsController',
angular.module('copayApp.controllers').controller('TransactionsController',
function($scope, $rootScope, $timeout, controllerUtils) {
$scope.title = 'Transactions';