Skip to content

Commit b89167d

Browse files
committed
Merge branch 'MAGETWO-80209' into MPI-PR-2.2.2
2 parents 5b4a422 + ea69831 commit b89167d

File tree

5 files changed

+153
-152
lines changed

5 files changed

+153
-152
lines changed

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public function applyInlineCssDataProvider()
369369
'<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
370370
'p { color: #000 }',
371371
[
372-
'<head><style type="text/css">div { color: #111; }</style></head>',
372+
'<style type="text/css">div { color: #111; }</style>',
373373
'<p style="color: #000;"></p>',
374374
],
375375
],

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"composer/composer": "1.4.1",
4343
"monolog/monolog": "^1.17",
4444
"oyejorge/less.php": "~1.7.0",
45-
"pelago/emogrifier": "0.1.1",
45+
"pelago/emogrifier": "1.2.0",
4646
"tubalmartin/cssmin": "4.1.0",
4747
"magento/magento-composer-installer": ">=0.1.11",
4848
"braintree/braintree_php": "3.22.0",

0 commit comments

Comments
 (0)