Frankie efa61f2cf8 Merge branch 'master' into shapeshiftTx		2016-08-18 11:06:32 -07:00
..
app.js	WIP: ShapeShift tx	2016-08-18 11:04:28 -07:00
identities.js	Manually linted	2016-06-21 13:56:04 -07:00
metamask.js	Added compliance for tests and properly accounts for N/A conversions.	2016-08-16 15:11:40 -07:00