Merge pull request #9566 from totten/master-19690-layout
authorcolemanw <coleman@civicrm.org>
Thu, 5 Jan 2017 17:42:34 +0000 (12:42 -0500)
committerGitHub <noreply@github.com>
Thu, 5 Jan 2017 17:42:34 +0000 (12:42 -0500)
commitac7830ba17213f599fded126748a0c27e9d82c03
tree6d10891ad869e1a886036d57e47c2295c59bfa61
parentc4f10bdde8763c3b8a2861d71dab6cfe29580932
parent3ac6e1072ef0434188b0f23288f12e1cbaac3916
Merge pull request #9566 from totten/master-19690-layout

CRM-19690 - crmMailing - Pick editor layout using template_type
tests/phpunit/Civi/Angular/ManagerTest.php