Merge pull request #12615 from eileenmcnaughton/amex
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 25 Oct 2018 09:15:34 +0000 (22:15 +1300)
committerGitHub <noreply@github.com>
Thu, 25 Oct 2018 09:15:34 +0000 (22:15 +1300)
CRM-21311 fix handling of credit cards where Amex has been given a different label

1  2 
CRM/Contribute/Form/ContributionBase.php
CRM/Core/Payment/Form.php
templates/CRM/Contribute/Form/Contribution/Confirm.tpl

Simple merge