Added the current uncommited changes to production code, and rebased to 4.6.8
authorRuben Rodriguez <ruben@fsf.org>
Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)
committerroot <root@crm.fsf.org>
Fri, 11 Sep 2015 01:27:21 +0000 (21:27 -0400)
commit62e13e769e97ba6cc4b8918f84311822b9902f2f
tree63f347c26d36fa8c77d2d75641a10b49daff6f25
parent228e7747a21e03c6e7c115c809306d468226c633
Added the current uncommited changes to production code, and rebased to 4.6.8
13 files changed:
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/GroupContact.php
CRM/Contact/BAO/GroupContactCache.php
CRM/Contact/Form/Task/PDFLatexCommon.php
CRM/Contribute/BAO/Contribution.php
CRM/Event/BAO/Participant.php
CRM/Member/BAO/Membership.php
CRM/Member/Import/Form/DataSource.php
CRM/Price/BAO/PriceSet.php
CRM/Utils/PDF/Utils.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl