Merge tag '4.7.28' into 4.7.28-fsf
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Dec 2017 20:27:41 +0000 (15:27 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Dec 2017 20:27:41 +0000 (15:27 -0500)
commit93a7db661e9dfbf0ca214093adeba4beb518026f
tree6c244c04cb221f43bbdff864dd7b48abe4cd19d7
parentb23a4b24ee9315d426a3cc84625ea6fc25f38a90
parentf765c0645269ceb3a16b767676bf3cff96fdeac7
Merge tag '4.7.28' into 4.7.28-fsf
22 files changed:
CRM/ACL/BAO/Cache.php
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/GroupContact.php
CRM/Contact/Form/Edit/TagsAndGroups.php
CRM/Contact/Task.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/ContributionBase.php
CRM/Core/Resources.php
CRM/Event/BAO/Participant.php
CRM/Import/Parser.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
CRM/Utils/Token.php
api/v3/Contact.php
api/v3/Contribution.php
api/v3/Mailing.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
templates/CRM/Contribute/Form/ContributionView.tpl