Fixed Conflicts:
index.html
This commit is contained in:
commit
5a0c1e235b
33 changed files with 322 additions and 202 deletions
|
|
@ -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';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue