Manuel Araoz 717b1e930f Merge branch 'master' of github.com:bitpay/mystery into test/test-p2p-sync ... Conflicts: lib/PeerSync.js lib/Sync.js		2014-01-17 10:22:49 -03:00
..
HistoricSync.js	fixes jshint warnings. add config for disabling sync	2014-01-16 23:23:10 -03:00
PeerSync.js	fixes jshint warnings. add config for disabling sync	2014-01-16 23:23:10 -03:00
Sync.js	Merge branch 'master' of github.com:bitpay/mystery into test/test-p2p-sync	2014-01-17 10:22:49 -03:00