projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2dd03c 5ec6b0a)
Merge pull request #6076 from mallezie/crm-16707
authorDave Greenberg <dave@civicrm.org>
Thu, 25 Jun 2015 21:20:53 +0000 (14:20 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 25 Jun 2015 21:20:53 +0000 (14:20 -0700)
CRM-16707 Make token usage the responsibality of the form

1  2 
CRM/Mailing/BAO/Mailing.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge