Merge remote-tracking branch 'mainline/develop' into publication
Showing
- .htaccess 2 additions, 0 deletions.htaccess
- .htaccess.sample 2 additions, 0 deletions.htaccess.sample
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml 1 addition, 1 deletion...es/catalog/product/view/type/bundle/option/checkbox.phtml
- app/code/Magento/Cron/Model/Observer.php 9 additions, 1 deletionapp/code/Magento/Cron/Model/Observer.php
- app/code/Magento/Cron/Test/Unit/Model/ObserverTest.php 82 additions, 0 deletionsapp/code/Magento/Cron/Test/Unit/Model/ObserverTest.php
- app/code/Magento/Customer/Model/AccountManagement.php 2 additions, 1 deletionapp/code/Magento/Customer/Model/AccountManagement.php
- app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php 13 additions, 5 deletions...ipping/Controller/Adminhtml/Order/Shipment/AddComment.php
- app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php 26 additions, 30 deletions...it/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
- dev/tests/functional/.htaccess 3 additions, 1 deletiondev/tests/functional/.htaccess
- lib/web/mage/backend/suggest.js 11 additions, 7 deletionslib/web/mage/backend/suggest.js
- lib/web/mage/validation.js 2 additions, 2 deletionslib/web/mage/validation.js
- nginx.conf.sample 1 addition, 0 deletionsnginx.conf.sample
- pub/.htaccess 2 additions, 0 deletionspub/.htaccess
Please register or sign in to comment