Jamal Jackson 19a3e9afdc Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps ... # Conflicts: # src/js/controllers/backup.js		2016-09-29 14:51:12 -04:00
..
img	added new design for add contact when user has empty address book	2016-09-28 14:53:01 -04:00
roboto-font
views	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps	2016-09-29 14:51:12 -04:00
cordova.js
index.html