Merge remote-tracking branch 'origin/MAGETWO-55393' into pr-develop (9b746fa3) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KIII-12
Magento
Commits
9b746fa3

Commit 9b746fa3 authored 8 years ago by

Karpenko, Oleksandr

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-55393' into pr-develop

# Conflicts:
#	app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

parents c84ef0fc 509d5fa5

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml 22 additions, 20 deletions

...dminhtml/templates/catalog/product/attribute/labels.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml 3 additions, 3 deletions

...minhtml/templates/catalog/product/attribute/options.phtml
app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml 5 additions, 4 deletions

...dminhtml/templates/catalog/product/attribute/visual.phtml
app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less 1 addition, 0 deletions

...o/backend/web/css/source/forms/fields/_control-table.less
app/design/adminhtml/Magento/backend/web/css/styles-old.less 5 additions, 0 deletions

app/design/adminhtml/Magento/backend/web/css/styles-old.less

with 36 additions and 27 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment