Merge remote-tracking branch 'upstream/develop' into...
Merge remote-tracking branch 'upstream/develop' into MAGETWO-58680-remove-unserialize-cache-frontend-interface-rebased
Showing
- app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml 12 additions, 21 deletions...view/frontend/templates/product/widget/content/grid.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml 2 additions, 2 deletions.../Cms/view/adminhtml/templates/browser/content/files.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml 1 addition, 1 deletion...s/view/adminhtml/templates/browser/content/uploader.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml 2 additions, 2 deletions...e/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
- app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml 5 additions, 1 deletion.../Cms/view/frontend/templates/widget/link/link_block.phtml
- app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml 5 additions, 1 deletion...Cms/view/frontend/templates/widget/link/link_inline.phtml
- app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml 1 addition, 1 deletion...ento/UrlRewrite/view/adminhtml/templates/categories.phtml
- app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 1 deletion...ew/adminhtml/templates/catalog/category/widget/tree.phtml
- app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml 1 addition, 1 deletion...idget/view/adminhtml/templates/instance/edit/layout.phtml
- dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php 0 additions, 4 deletions...e/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
Please register or sign in to comment