5 commits

Author	SHA1	Message	Date
Marty Alcala	78bd523391	fix merge conflicts	2016-10-18 17:23:43 -04:00
Jason Dreyzehner	ea647ae259	chore(clean): remove unused files	2016-10-17 19:09:56 -04:00
Gabriel Bazán	fa905cb719	fix wallet icon amount view	2016-10-14 09:41:33 -03:00
Gustavo Maximiliano Cortez	35cd6ce4cc	New flow to link the bitpay card	2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez	4bb2375ed0	Ref and add pbkdf2 as angular module	2016-08-10 16:08:27 -03:00