Kevin Serrano 162aedb30b Merge branch 'master' into new-currency-test		2017-09-05 09:01:05 -07:00
..
accounts/import
components	Multiple tokens shows the amount when greater than 1	2017-08-29 17:54:01 -07:00
css
first-time
img
keychains/hd
reducers
account-detail.js
actions.js	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
add-token.js
app.js
conf-tx.js
config.js	integrate infura currency	2017-08-29 16:36:05 -07:00
conversion.json
info.js	Update support link	2017-09-01 11:01:53 -07:00
infura-conversion.json	integrate infura currency	2017-08-29 16:36:05 -07:00
new-keychain.js
reducers.js	Add version to state logs	2017-08-29 11:42:44 -07:00
root.js
send.js
settings.js
store.js
template.js
unlock.js
util.js