Wallet/js
Gustavo Cortez 6b33f0425a Fixed conflicts with 'master'.
Merge branch 'master' into feature/wallet

Conflicts:
	copay.js
2014-04-11 15:08:00 -03:00
..
controllers add maxPeer check 2014-04-09 11:05:25 -03:00
models Fixed conflicts with 'master'. 2014-04-11 15:08:00 -03:00
services add maxPeer check 2014-04-09 11:05:25 -03:00
app.js added support for localstorage 2014-04-01 18:22:07 -03:00
config.js add maxPeer check 2014-04-09 11:05:25 -03:00
copayBundle.js moved copayBundle.js 2014-04-10 12:36:17 -03:00
directives.js move all files to root path 2014-03-21 14:21:13 -03:00
filters.js move all files to root path 2014-03-21 14:21:13 -03:00
init.js fix peers, pubkey WIP 2014-04-08 00:54:38 -03:00
routes.js fix peers, pubkey WIP 2014-04-08 00:54:38 -03:00