Merge pull request #11047 from mattwire/CRM-21244_setting_to_disable_sending_from_con...
authorYashodha Chaku <yashodha@cividesk.com>
Fri, 12 Jan 2018 11:01:02 +0000 (16:31 +0530)
committerGitHub <noreply@github.com>
Fri, 12 Jan 2018 11:01:02 +0000 (16:31 +0530)
commitb74f7a4dede9bb12ef1d1ffd28bf4dba73aaf56b
treea3e67141659bb959232e991e33298c9e41a31973
parent786109a3ab766a3ddce8938d5813b9a3929870b5
parent99ad38dfc5103ac34c4ca4aa5404b921c1caf470
Merge pull request #11047 from mattwire/CRM-21244_setting_to_disable_sending_from_contact_email

CRM-21244 Enhancements to "FROM email addresses"
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Mailing/BAO/Mailing.php
CRM/Member/Form/Membership.php
templates/CRM/Contribute/Form/Contribution.tpl