Merge remote-tracking branch 'upstream/2.2-develop' into...
Merge remote-tracking branch 'upstream/2.2-develop' into MAGETWO-84650-missing-periods-release-notification
Showing
- app/code/Magento/Catalog/Block/Product/View/Attributes.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Block/Product/View/Attributes.php
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml 3 additions, 1 deletion...minhtml/templates/catalog/product/attribute/options.phtml
- app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml 2 additions, 0 deletions...w/frontend/templates/product/view/options/type/text.phtml
- app/code/Magento/Theme/Model/Design/Config/Storage.php 5 additions, 2 deletionsapp/code/Magento/Theme/Model/Design/Config/Storage.php
- dev/tests/integration/testsuite/Magento/Theme/Model/Design/ConfigTest.php 40 additions, 0 deletions...ation/testsuite/Magento/Theme/Model/Design/ConfigTest.php
- dev/tests/integration/testsuite/Magento/Theme/_files/config_data.php 19 additions, 0 deletions...ntegration/testsuite/Magento/Theme/_files/config_data.php
- dev/tests/integration/testsuite/Magento/Theme/_files/config_data_rollback.php 13 additions, 0 deletions...n/testsuite/Magento/Theme/_files/config_data_rollback.php
- dev/tests/js/jasmine/tests/lib/mage/validation.test.js 72 additions, 0 deletionsdev/tests/js/jasmine/tests/lib/mage/validation.test.js
- lib/web/i18n/en_US.csv 1 addition, 0 deletionslib/web/i18n/en_US.csv
- lib/web/mage/validation.js 18 additions, 0 deletionslib/web/mage/validation.js
Please register or sign in to comment