anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into feature/socket-io-support

Browse source 
Fix conflicts:
	js/app.js
	js/controllers/signin.js
This commit is contained in:
Gustavo Cortez 2014-04-17 11:58:11 -03:00
commit 2454d930fa
9 changed files with 63 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/app.js
View file

@ -12,6 +12,7 @@ angular.module('copay',[
'copay.walletFactory',
'copay.signin',
'copay.socket',
'copay.controllerUtils',
'copay.setup',
'copay.peer'
]);
@ -22,6 +23,7 @@ angular.module('copay.transactions', []);
angular.module('copay.send', []);
angular.module('copay.backup', []);
angular.module('copay.walletFactory', []);
angular.module('copay.controllerUtils', []);
angular.module('copay.signin', []);
angular.module('copay.setup', []);
angular.module('copay.peer', []);