Fix Conflicts:

views/addresses.html
	views/send.html
	views/transactions.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-05 17:06:25 -03:00
commit 6a855b7ac1
18 changed files with 393 additions and 89 deletions

View file

@ -13,7 +13,7 @@ if (localConfig) {
if (key === 'networkName' && config['forceNetwork']) {
return;
}
config[name] = value;
config[key] = value;
});
}
}