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

Fixed conflicts with 'master'.

Browse source 
Merge branch 'master' into feature/wallet

Conflicts:
	copay.js
This commit is contained in:
Gustavo Cortez 2014-04-11 15:08:00 -03:00
commit 6b33f0425a
15 changed files with 3618 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

2
copay.js
View file

@ -2,5 +2,5 @@
module.exports.Storage = require('./js/models/Storage');
module.exports.PublicKeyRing = require('./js/models/PublicKeyRing');
module.exports.Wallet = require('./js/models/Wallet');
module.exports.CopayPeer = require('./js/models/CopayPeer');
module.exports.FakeStorage = require('./test/FakeStorage');