Merge remote-tracking branch 'origin/develop' into MAGETWO-33537
Showing
- app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php 1 addition, 1 deletion...ento/Config/Block/System/Config/Form/Fieldset/Factory.php
- app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php 173 additions, 0 deletions...ento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
- app/code/Magento/Config/Test/Unit/Block/System/Config/EditTest.php 39 additions, 0 deletions...Magento/Config/Test/Unit/Block/System/Config/EditTest.php
- app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php 15 additions, 1 deletion...o/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
- app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php 199 additions, 65 deletions...System/Config/Form/Fieldset/Modules/DisableOutputTest.php
- app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php 150 additions, 67 deletions...onfig/Test/Unit/Block/System/Config/Form/FieldsetTest.php
- app/code/Magento/Email/Model/Template.php 3 additions, 4 deletionsapp/code/Magento/Email/Model/Template.php
- app/code/Magento/Email/Model/Template/Filter.php 50 additions, 0 deletionsapp/code/Magento/Email/Model/Template/Filter.php
- app/code/Magento/Email/Test/Unit/Model/TemplateTest.php 37 additions, 45 deletionsapp/code/Magento/Email/Test/Unit/Model/TemplateTest.php
- lib/internal/Magento/Framework/Filter/Template.php 0 additions, 50 deletionslib/internal/Magento/Framework/Filter/Template.php
Please register or sign in to comment