Gustavo Cortez 6b33f0425a Fixed conflicts with 'master'. ... Merge branch 'master' into feature/wallet Conflicts: copay.js		2014-04-11 15:08:00 -03:00
..
CopayPeer.js	add maxPeer check	2014-04-09 11:05:25 -03:00
Peer.js	new CopayPeer class. Peers working!	2014-04-08 18:35:43 -03:00
PublicKeyRing.js	adds PublicKeyRing syncing to the new classes schema	2014-04-09 02:20:28 -03:00
Storage.js	new CopayPeer class. Peers working!	2014-04-08 18:35:43 -03:00
Wallet.js	Wallet model and testing	2014-04-10 17:57:41 -03:00