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

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

Browse source 
Fixed conflicts on:
	index.html
	js/app.js
This commit is contained in:
Gustavo Cortez 2014-04-17 00:43:50 -03:00
commit 7d52f8487b
39 changed files with 1459 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/app.js
View file

@ -9,10 +9,11 @@ angular.module('copay',[
'copay.transactions',
'copay.send',
'copay.backup',
'copay.network',
'copay.walletFactory',
'copay.signin',
'copay.peer',
'copay.socket'
'copay.socket',
'copay.setup',
'copay.peer'
]);
angular.module('copay.header', []);
@ -20,8 +21,9 @@ angular.module('copay.home', []);
angular.module('copay.transactions', []);
angular.module('copay.send', []);
angular.module('copay.backup', []);
angular.module('copay.network', []);
angular.module('copay.walletFactory', []);
angular.module('copay.signin', []);
angular.module('copay.setup', []);
angular.module('copay.peer', []);
angular.module('copay.socket', []);