Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-44443 (7e66b072) · Commits · KIII-12 / Magento

Commit 7e66b072 authored 9 years ago by

Gurzhyi, Andrii

Browse files

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-44443

parents fdec2478 02e0378c

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml 1 addition, 1 deletion

...o/Braintree/view/frontend/templates/creditcard/edit.phtml
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php 2 additions, 2 deletions

...agento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php 2 additions, 2 deletions

...to/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php 1 addition, 1 deletion

...og/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php 1 addition, 1 deletion

...log/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php 2 additions, 2 deletions

...og/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php 1 addition, 1 deletion

...nto/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php 1 addition, 1 deletion

...to/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php 1 addition, 1 deletion

...ento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php 1 addition, 1 deletion

...gento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php 1 addition, 1 deletion

app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
app/code/Magento/Catalog/Block/Product/TemplateSelector.php 1 addition, 1 deletion

app/code/Magento/Catalog/Block/Product/TemplateSelector.php
app/code/Magento/Catalog/Block/Product/View/Options.php 1 addition, 1 deletion

app/code/Magento/Catalog/Block/Product/View/Options.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php 1 addition, 1 deletion

...g/Controller/Adminhtml/Product/AddAttributeToTemplate.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php 1 addition, 1 deletion

.../Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php 1 addition, 1 deletion

...gento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php 1 addition, 1 deletion

...Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php 2 additions, 2 deletions

...agento/Catalog/Controller/Adminhtml/Product/Set/Index.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php 3 additions, 3 deletions

...Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php 2 additions, 2 deletions

...log/Controller/Adminhtml/Product/SuggestAttributeSets.php

with 27 additions and 27 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-44443