Merge pull request #8474 from monishdeb/CRM-17608
authorcolemanw <coleman@civicrm.org>
Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)
committerGitHub <noreply@github.com>
Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)
commit5ae39bbf5ca5730fa4697c269ac81efd1f99068a
tree2b7aa13a92b3a93ec8f728fffced1e44d2c7a118
parent038f20f90f425a1bf452f1f4de5f4deb61d80a0e
parent1410eae7c1ea2d3906120ff4347ba8de19071b17
Merge pull request #8474 from monishdeb/CRM-17608

CRM-17608: Merge to DOCx or ODT template