fix merge

This commit is contained in:
Manuel Araoz 2014-04-24 18:59:24 -03:00
parent 97014cdace
commit d98bc6f2e9
1 changed files with 1 additions and 1 deletions

View File

@ -14,7 +14,7 @@ var copayApp = window.copayApp = angular.module('copay',[
'copay.socket',
'copay.controllerUtils',
'copay.setup',
'copay.directives'
'copay.directives',
'copay.video'
]);