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)
commit1df5b3f9077102c41f32bf887cfb96d21f707489
treeba7e2476c11c0f1a90a3ebdd46d76053284b6eda
parent43658ce5d1743da5575081e33dc746d90e5c78d5
parentc1e588e87502c1d150567fa381d04acfaaf45638
Merge pull request #9645 from totten/4.6-mailing-tmpl

(Backport) CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes