Alexander Tseung ef61ef2ce8 Fix i18n merge conflicts		2018-03-29 09:37:29 -07:00
..
base	Remove chrome focus outline for mouse users. (#3230)	2018-02-12 09:45:53 -08:00
components	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
generic	Update button styles	2018-03-25 22:58:04 -07:00
objects	Lint and cleanup all scss	2017-08-14 10:31:27 +02:00
settings	Merge branch 'master' into i3326-addtokenscreendesignupdate	2018-03-26 16:51:02 -02:30
tools	Change LOOSE label to IMPORTED	2017-10-23 23:11:47 -07:00
trumps	Hook up actions to EditAccountNameModal	2017-08-21 04:46:38 -07:00