Jamal Jackson 794e0a304e Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser ... # Conflicts: # www/views/tab-settings.html		2016-10-13 11:57:24 -04:00
..
js	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser	2016-10-13 11:57:24 -04:00
sass	Fix styling for import/export views	2016-10-13 11:47:32 -03:00