projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edc10fa 83aa0e6)
Merge pull request #15778 from agh1/reminder-do-not-email-test
authorTim Otten <totten@civicrm.org>
Thu, 9 Jan 2020 00:27:11 +0000 (16:27 -0800)
committerGitHub <noreply@github.com>
Thu, 9 Jan 2020 00:27:11 +0000 (16:27 -0800)
dev/core#1378 Scheduled reminders: do not email if do_not_email or on_hold

1  2 
CRM/Contact/BAO/Contact.php patch | diff1 | diff2 | blob | history
CRM/Core/BAO/ActionSchedule.php patch | diff1 | diff2 | blob | history
tests/phpunit/CRM/Activity/ActionMappingTest.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/BAO/Contact.php
Simple merge
diff --cc CRM/Core/BAO/ActionSchedule.php
Simple merge