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
..
backupRequest.html	add backup warning view to backup flow	2016-09-27 09:58:56 -03:00
collectEmail.html	fix style issues with discomainer view and collect email, mostly checkbox related	2016-09-19 14:18:51 -04:00
disclaimer.html	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps	2016-09-29 14:51:12 -04:00
notifications.html	onboarding - disable scroll - skip notification view on android	2016-09-13 17:12:17 -03:00
tour.html	fix get new and updates positioning	2016-09-19 15:34:32 -04:00
welcome.html	onboarding - disable scroll - skip notification view on android	2016-09-13 17:12:17 -03:00