Merge branch 'MAGETWO-62486' of github.com:magento-troll/magento2ce into Sprint55 (5f760074) · 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
5f760074

Commit 5f760074 authored 8 years ago by

Stanislav Lopukhov

Downloads
- Plain Diff

Merge branch 'MAGETWO-62486' of github.com:magento-troll/magento2ce into Sprint55

parents 3210e523 0a65f0b1

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/internal/Magento/Framework/View/Layout.php 20 additions, 3 deletions

lib/internal/Magento/Framework/View/Layout.php
lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php 58 additions, 9 deletions

...rnal/Magento/Framework/View/Layout/ScheduledStructure.php
lib/internal/Magento/Framework/View/Page/Config/Structure.php 56 additions, 0 deletions

...internal/Magento/Framework/View/Page/Config/Structure.php
lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php 92 additions, 7 deletions

lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php

with 226 additions and 19 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