Merge pull request #7470 from eileenmcnaughton/minor-tidy
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)
commit64a155b595059761e3a852be1a44225b29107366
tree19f46cf6f021ac4915c516bbd52ac97109ca86ee
parent39bc40582a26ed0947003a309e32c07616098128
parent1524a00750883e41e7ca813a109140bfedd03bdd
Merge pull request #7470 from eileenmcnaughton/minor-tidy

Minor tidy up - pass through 'cancel' rather than leave as unintuitiv…
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/CancelSubscription.php
CRM/Core/Payment.php
CRM/Core/Payment/ProcessorForm.php
CRM/Member/BAO/Membership.php