Kevin Serrano 0a3849ec84 Fix merge conflicts.		2017-03-01 10:01:21 -08:00
..
app.js	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
identities.js	Manually linted	2016-06-21 13:56:04 -07:00
metamask.js	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00