Merge remote-tracking branch 'main-ce/develop' into MAGETWO-36096 (2652c4d4) · 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
2652c4d4

Commit 2652c4d4 authored 10 years ago by

Yuri Kovsher

Downloads
- Plain Diff

Merge remote-tracking branch 'main-ce/develop' into MAGETWO-36096

parents 8f1d9fd2 0247336a

Branches

Tags

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Sales/etc/adminhtml/system.xml 1 addition, 1 deletion

app/code/Magento/Sales/etc/adminhtml/system.xml
app/code/Magento/SalesSequence/composer.json 1 addition, 1 deletion

app/code/Magento/SalesSequence/composer.json
app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php 1 addition, 1 deletion

...ode/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php 1 addition, 1 deletion

...o/Framework/Less/Test/Unit/File/Collector/LibraryTest.php
lib/internal/Magento/Framework/View/Element/BlockFactory.php 1 addition, 1 deletion

lib/internal/Magento/Framework/View/Element/BlockFactory.php

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