Skip to content

Commit 3d555e0

Browse files
author
David Alger
committed
Merge branch 'MAGETWO-37589_email-templates-localization' into MAGETWO-37843-responsive-email-templates-in-blank-theme
# Conflicts: # lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
2 parents 7a546c7 + 2af8f3d commit 3d555e0

File tree

22 files changed

+29
-26
lines changed

22 files changed

+29
-26
lines changed

app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/Authorization/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/BundleImportExport/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/CacheInvalidate/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/CatalogWidget/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/CmsUrlRewrite/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/ConfigurableImportExport/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/Cookie/i18n/en_US.csv

Whitespace-only changes.

app/code/Magento/Developer/i18n/en_US.csv

Whitespace-only changes.

0 commit comments

Comments
 (0)