Merge remote-tracking branch 'mainline/develop' into MAGETWO-32346
Conflicts: composer.lock
Showing
- CONTRIBUTING.md 22 additions, 19 deletionsCONTRIBUTING.md
- app/code/Magento/Catalog/i18n/de_DE.csv 1 addition, 1 deletionapp/code/Magento/Catalog/i18n/de_DE.csv
- app/code/Magento/Core/Model/Theme/Collection.php 1 addition, 9 deletionsapp/code/Magento/Core/Model/Theme/Collection.php
- app/code/Magento/Reports/i18n/de_DE.csv 1 addition, 1 deletionapp/code/Magento/Reports/i18n/de_DE.csv
- app/code/Magento/Sales/i18n/de_DE.csv 1 addition, 1 deletionapp/code/Magento/Sales/i18n/de_DE.csv
- app/code/Magento/Wishlist/i18n/de_DE.csv 1 addition, 1 deletionapp/code/Magento/Wishlist/i18n/de_DE.csv
- app/design/adminhtml/Magento/backend/theme.xml 1 addition, 0 deletionsapp/design/adminhtml/Magento/backend/theme.xml
- app/design/frontend/Magento/blank/theme.xml 1 addition, 0 deletionsapp/design/frontend/Magento/blank/theme.xml
- app/design/frontend/Magento/luma/theme.xml 2 additions, 0 deletionsapp/design/frontend/Magento/luma/theme.xml
- composer.json 2 additions, 4 deletionscomposer.json
- composer.lock 77 additions, 15 deletionscomposer.lock
- dev/tests/api-functional/.gitignore 3 additions, 0 deletionsdev/tests/api-functional/.gitignore
- dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php 69 additions, 0 deletions...al/_files/Magento/TestModule1/Controller/CookieTester.php
- dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/DeleteCookie.php 21 additions, 0 deletions...ento/TestModule1/Controller/CookieTester/DeleteCookie.php
- dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetPublicCookie.php 49 additions, 0 deletions...o/TestModule1/Controller/CookieTester/SetPublicCookie.php
- dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetSensitiveCookie.php 33 additions, 0 deletions...estModule1/Controller/CookieTester/SetSensitiveCookie.php
- dev/tests/api-functional/_files/Magento/TestModule1/Service/V1/AllSoapAndRest.php 108 additions, 0 deletions.../_files/Magento/TestModule1/Service/V1/AllSoapAndRest.php
- dev/tests/api-functional/_files/Magento/TestModule1/Service/V1/AllSoapAndRestInterface.php 50 additions, 0 deletions...agento/TestModule1/Service/V1/AllSoapAndRestInterface.php
- dev/tests/api-functional/_files/Magento/TestModule1/Service/V1/Entity/CustomAttributeDataObject.php 16 additions, 0 deletions...stModule1/Service/V1/Entity/CustomAttributeDataObject.php
- dev/tests/api-functional/_files/Magento/TestModule1/Service/V1/Entity/CustomAttributeDataObjectBuilder.php 20 additions, 0 deletions...e1/Service/V1/Entity/CustomAttributeDataObjectBuilder.php
Please register or sign in to comment