Marty Alcala 6bfdec29b3 fix merge conflicts		2016-10-11 19:14:13 -04:00
..
amazon-card-details.html
bitpay-card-confirmation.html
coinbase-confirmation.html
coinbase-tx-details.html
confirmation.html
customAmount.html
glidera-tx-details.html
paypro.html
search.html
terms.html
tx-details.html	Merge pull request #381 from bitjson/wip/design	2016-10-11 15:14:05 -04:00
tx-status.html	delete unused code and fixes	2016-10-11 10:19:05 -03:00
txp-details.html	remove commented code	2016-10-11 19:10:13 -04:00
wallets.html