Merge branch 'develop' into fix/prophecy-doubler-error-for-product-model (120247c8) · Commits · KIII-12 / Magento

Snippets Groups Projects

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.

Commit 120247c8 authored 9 years ago by

Tibor Kotosz

Browse files

Merge branch 'develop' into fix/prophecy-doubler-error-for-product-model

Conflicts:
	app/code/Magento/Catalog/Model/Product.php
	app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php

parents b15d9507 24abff16

Hide whitespace changes

Inline Side-by-side

Showing with 264 additions and 313 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'develop' into fix/prophecy-doubler-error-for-product-model

Some changes are not shown.