Skip to content

Commit 5112550

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/classyllama/MAGETWO-37843-responsive-email-templates-in-blank-theme' into MAGETWO-37843-responsive-email-templates-in-blank-theme
2 parents 1ff8df1 + 3d555e0 commit 5112550

File tree

40 files changed

+128
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

40 files changed

+128
-162
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.gitignore

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/.buildpath
2+
/.cache
3+
/.metadata
4+
/.project
5+
/.settings
6+
atlassian*
7+
/nbproject
8+
/sitemap
9+
/.idea
10+
/.gitattributes
11+
/app/config_sandbox
12+
/app/etc/config.php
13+
/app/etc/env.php
14+
/app/code/Magento/TestModule*
15+
/lib/internal/flex/uploader/.actionScriptProperties
16+
/lib/internal/flex/uploader/.flexProperties
17+
/lib/internal/flex/uploader/.project
18+
/lib/internal/flex/uploader/.settings
19+
/lib/internal/flex/varien/.actionScriptProperties
20+
/lib/internal/flex/varien/.flexLibProperties
21+
/lib/internal/flex/varien/.project
22+
/lib/internal/flex/varien/.settings
23+
/node_modules
24+
/.grunt
25+
26+
/pub/media/*.*
27+
!/pub/media/.htaccess
28+
/pub/media/catalog/*
29+
!/pub/media/catalog/.htaccess
30+
/pub/media/customer/*
31+
!/pub/media/customer/.htaccess
32+
/pub/media/downloadable/*
33+
!/pub/media/downloadable/.htaccess
34+
/pub/media/import/*
35+
!/pub/media/import/.htaccess
36+
/pub/media/theme/*
37+
/pub/media/theme_customization/*
38+
!/pub/media/theme_customization/.htaccess
39+
/pub/media/wysiwyg/*
40+
!/pub/media/wysiwyg/.htaccess
41+
/pub/media/tmp/*
42+
!/pub/media/tmp/.htaccess
43+
/pub/media/captcha/*
44+
/pub/static/*
45+
!/pub/static/.htaccess
46+
47+
/var/*
48+
!/var/.htaccess
49+
/vendor

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.

0 commit comments

Comments
 (0)