Jamal Jackson 3d9e40b4c5 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser ... # Conflicts: # src/js/services/externalLinkService.js		2016-10-12 13:57:21 -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 13:57:21 -04:00
cordova.js
index.html