From 1a8d7ea58b610df18732a685577c034a980cce08 Mon Sep 17 00:00:00 2001
From: David Alger <david@classyllama.com>
Date: Wed, 5 Aug 2015 09:34:37 -0500
Subject: [PATCH 1/2] REL-12 HTML markup in Plain Text Templates

- resolved static test issue
---
 app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
index de668564ea9b5..d4a6f5d68a171 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -5,6 +5,7 @@
  */
 
 namespace Magento\Newsletter\Test\Unit\Model;
+
 use Magento\Framework\App\TemplateTypesInterface;
 
 /**

From dee47981ffe3e28f6ae787db33e2acc0d2b85d4c Mon Sep 17 00:00:00 2001
From: Alexander Paliarush <apaliarush@ebay.com>
Date: Thu, 6 Aug 2015 11:49:15 +0300
Subject: [PATCH 2/2] MAGETWO-40818: Review and accept Transactional Email
 Template PR

---
 app/code/Magento/Email/Model/Template.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index 2529c724732c2..4d1b0fff43aef 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -105,21 +105,22 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
     private $filterFactory;
 
     /**
-     * Initialize dependencies
+     * Initialize dependencies.
      *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Template\Config $emailConfig
-     * @param \Magento\Email\Model\TemplateFactory $templateFactory
+     * @param TemplateFactory $templateFactory
+     * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Magento\Email\Model\Template\FilterFactory $filterFactory
-     * @param array $data optional generic object data
+     * @param Template\FilterFactory $filterFactory
+     * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */