Merge commit 'refs/pull/1126/head' of https://github.com/magento/magento2 into publication (d5a1a820) · 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
d5a1a820

Commit d5a1a820 authored 10 years ago by

Vladimir Pelipenko

Downloads
- Plain Diff

Merge commit 'refs/pull/1126/head' of https://github.com/magento/magento2 into publication

parents 1ca99b32 f293d160

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Fedex/Setup/InstallData.php 1 addition, 1 deletion

app/code/Magento/Fedex/Setup/InstallData.php
app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml 1 addition, 1 deletion

...gento/Payment/view/adminhtml/templates/info/default.phtml
app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml 2 additions, 2 deletions

...o/Payment/view/adminhtml/templates/info/pdf/default.phtml
app/code/Magento/Payment/view/frontend/templates/info/default.phtml 1 addition, 1 deletion

...agento/Payment/view/frontend/templates/info/default.phtml
app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php 1 addition, 1 deletion

...Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
app/code/Magento/SalesRule/Model/Resource/Report/Collection.php 1 addition, 1 deletion

...de/Magento/SalesRule/Model/Resource/Report/Collection.php
dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php 1 addition, 1 deletion

...ableProduct/Test/Constraint/AssertChildProductsInGrid.php

with 8 additions and 8 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