Merge remote-tracking branch 'origin/MAGETWO-57210' into pr-develop (5c5c43ef) · 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
5c5c43ef

Commit 5c5c43ef authored 8 years ago by

Ievgen Kolesov

Downloads
- Plain Diff

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

parents 0b0982fc de25f5d6

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml 2 additions, 1 deletion

...nd/templates/product/view/type/options/configurable.phtml
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 43 additions, 37 deletions

.../ConfigurableProduct/view/frontend/web/js/configurable.js
app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml 2 additions, 2 deletions

...tches/view/frontend/templates/product/view/renderer.phtml
app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 36 additions, 19 deletions

.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
app/design/frontend/Magento/luma/etc/view.xml 1 addition, 4 deletions

app/design/frontend/Magento/luma/etc/view.xml

with 84 additions and 63 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