fix merge conflicts
This commit is contained in:
commit
d4513ba46b
53 changed files with 263 additions and 204 deletions
|
|
@ -149,6 +149,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
|||
}
|
||||
});
|
||||
});
|
||||
if ($scope.hasFunds != true) {
|
||||
$ionicScrollDelegate.freezeScroll(true);
|
||||
}
|
||||
};
|
||||
|
||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue