Merge pull request #3559 from bitpay/v1.5

Merge into v1.6 from v1.5
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 14:50:49 -03:00
commit 486b24eeb1
19 changed files with 24 additions and 25 deletions

View file

@ -637,7 +637,7 @@ angular.module('copayApp.services')
name: config.aliasFor[c.walletId] || c.walletName,
id: c.walletId,
network: c.network,
color: config.colorFor[c.walletId] || '#2C3E50'
color: config.colorFor[c.walletId] || '#4A90E2'
};
});
ret = lodash.filter(ret, function(w) {