projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43658ce c1e588e)
Merge pull request #9645 from totten/4.6-mailing-tmpl
authorTim Otten <totten@civicrm.org>
Wed, 18 Jan 2017 10:08:19 +0000 (02:08 -0800)
committerGitHub <noreply@github.com>
Wed, 18 Jan 2017 10:08:19 +0000 (02:08 -0800)
(Backport) CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes


Trivial merge