Jamal Jackson 1caf875ad1 Merge branch 'ref/design' of https://github.com/jamal-jackson/bitpay-wallet into feature/get_started_tour ... # Conflicts: # public/views/onboarding/welcome.html		2016-09-01 10:12:35 -04:00
..
img	pulled in latest commits from yesterday, merged and handled conflicts	2016-09-01 08:59:37 -04:00
roboto-font	add woff, woff2 font extension	2016-08-31 15:12:44 -03:00
views	Merge branch 'ref/design' of https://github.com/jamal-jackson/bitpay-wallet into feature/get_started_tour	2016-09-01 10:12:35 -04:00
cordova.js	Adds scan tab. Fix grunt ios	2016-08-17 15:23:17 -03:00
index.html	fix status	2016-08-23 12:10:48 -03:00