Jamal Jackson 7becb504f4 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser ... # Conflicts: # www/views/glidera.html		2016-10-12 08:59:04 -04:00
..
img	fix merge conflicts	2016-10-11 19:14:13 -04:00
roboto-font
views	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser	2016-10-12 08:59:04 -04:00
cordova.js
index.html