Merge tag '5.0.0' into 5.0.0-fsf
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 13 Apr 2018 15:30:03 +0000 (11:30 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 13 Apr 2018 15:30:03 +0000 (11:30 -0400)
commit93c79e6cad506b02e1befb17cd0b132d4ea0cd76
tree15c2670331d3d409adbcda4a3cfc407c4852305e
parent3a078cfe5c587a7eb4ecdf1d2a115a3891239675
parent8ea54dd839d69b0481e8b833516a992ccb84a8ed
Merge tag '5.0.0' into 5.0.0-fsf
28 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/Contribute/Task.php
CRM/Core/Resources.php
CRM/Event/BAO/Participant.php
CRM/Event/Form/Registration/Confirm.php
CRM/Import/Parser.php
CRM/Member/BAO/Membership.php
CRM/Member/Import/Form/DataSource.php
CRM/Price/BAO/PriceSet.php
CRM/Profile/Form.php
CRM/Utils/PDF/Utils.php
CRM/Utils/Sort.php
CRM/Utils/Token.php
api/v3/Contribution.php
api/v3/Mailing.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
templates/CRM/Contribute/Form/ContributionView.tpl