Skip to content

Commit f54766d

Browse files
author
Denys Rul
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents fa7a7c2 + a2cd3fc commit f54766d

File tree

3 files changed

+70
-20
lines changed

3 files changed

+70
-20
lines changed

app/code/Magento/Newsletter/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"magento/module-email": "0.42.0-beta4",
1313
"magento/module-cron": "0.42.0-beta4",
1414
"magento/module-eav": "0.42.0-beta4",
15+
"magento/module-require-js": "0.42.0-beta4",
1516
"magento/framework": "0.42.0-beta4",
1617
"magento/magento-composer-installer": "*"
1718
},

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ define([
276276

277277
domReady(function () {
278278
$('body')
279-
.pageCache()
280279
.msgBox()
281280
.formKey();
282281
});

composer.lock

Lines changed: 69 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)