Merge pull request #9562 from totten/master-19690-schema
authorTim Otten <totten@civicrm.org>
Tue, 20 Dec 2016 04:34:39 +0000 (20:34 -0800)
committerGitHub <noreply@github.com>
Tue, 20 Dec 2016 04:34:39 +0000 (20:34 -0800)
CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes.


Trivial merge