Commit Graph

4 Commits

Author SHA1 Message Date
Gustavo Cortez 6b33f0425a Fixed conflicts with 'master'.
Merge branch 'master' into feature/wallet

Conflicts:
	copay.js
2014-04-11 15:08:00 -03:00
Gustavo Cortez ad56a30e77 Wallet model and testing 2014-04-10 17:57:41 -03:00
Matias Alejo Garcia fab2c8a505 new CopayPeer class. Peers working! 2014-04-08 18:35:43 -03:00
Matias Alejo Garcia a658ec8452 copay tests in the browser! 2014-04-07 15:31:41 -03:00