Alexander Tseung 4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254

2018-04-05 23:17:22 -07:00

..

create-account

Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254

2018-04-05 23:17:22 -07:00

keychains

Fix lint errors

2018-04-02 16:24:37 -07:00

settings

Fix merge conflicts

2018-03-30 16:18:48 -07:00

add-token.js

Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254

2018-04-05 10:07:14 -07:00

authenticated.js

Add initialized checks for first time flow routes

2017-12-14 14:11:23 -08:00

home.js

Fix transaction confirmations

2018-04-03 16:59:32 -07:00

initialized.js

Add initialized checks for first time flow routes

2017-12-14 14:11:23 -08:00

metamask-route.js

Add routes for mascara

2017-12-14 14:11:23 -08:00

notice.js

Add routes for mascara

2017-12-14 14:11:23 -08:00

unlock.js

Fix lint errors

2018-04-02 16:24:37 -07:00