Merge branch 'develop_mainline' into MAGETWO-20037-fix-functional-tests
Conflicts: app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
Showing
- .htaccess 0 additions, 4 deletions.htaccess
- .htaccess.sample 0 additions, 4 deletions.htaccess.sample
- CONTRIBUTING.md 3 additions, 3 deletionsCONTRIBUTING.md
- CONTRIBUTOR_LICENSE_AGREEMENT.html 0 additions, 137 deletionsCONTRIBUTOR_LICENSE_AGREEMENT.html
- app/code/Magento/AdminNotification/etc/acl.xml 5 additions, 5 deletionsapp/code/Magento/AdminNotification/etc/acl.xml
- app/code/Magento/AdminNotification/etc/adminhtml/menu.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/menu.xml
- app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js 4 additions, 1 deletion...Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
- app/code/Magento/Backend/App/AbstractAction.php 1 addition, 1 deletionapp/code/Magento/Backend/App/AbstractAction.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php 1 addition, 1 deletion...to/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php
- app/code/Magento/Backend/etc/acl.xml 26 additions, 26 deletionsapp/code/Magento/Backend/etc/acl.xml
- app/code/Magento/Backend/etc/adminhtml/menu.xml 21 additions, 21 deletionsapp/code/Magento/Backend/etc/adminhtml/menu.xml
- app/code/Magento/Backend/etc/di.xml 5 additions, 0 deletionsapp/code/Magento/Backend/etc/di.xml
- app/code/Magento/Backend/etc/menu.xsd 2 additions, 1 deletionapp/code/Magento/Backend/etc/menu.xsd
- app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml 3 additions, 0 deletions...nto/Backend/view/adminhtml/templates/media/uploader.phtml
- app/code/Magento/Backup/etc/acl.xml 2 additions, 2 deletionsapp/code/Magento/Backup/etc/acl.xml
- app/code/Magento/Backup/etc/adminhtml/menu.xml 1 addition, 1 deletionapp/code/Magento/Backup/etc/adminhtml/menu.xml
- app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/CcTypes.php 6 additions, 6 deletions...gento/BraintreeTwo/Block/Adminhtml/Form/Field/CcTypes.php
- app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/Countries.php 3 additions, 3 deletions...nto/BraintreeTwo/Block/Adminhtml/Form/Field/Countries.php
- app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/CountryCreditCard.php 7 additions, 8 deletions...ntreeTwo/Block/Adminhtml/Form/Field/CountryCreditCard.php
- app/code/Magento/BraintreeTwo/Block/Customer/CardRenderer.php 65 additions, 0 deletions...code/Magento/BraintreeTwo/Block/Customer/CardRenderer.php
Please register or sign in to comment