Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

M2 content provisioning
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4ba395d2

Unverified Commit 4ba395d2 authored 5 years ago by Vadim Justus Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #19 from magento-hackathon/develop

Merge current development to 1.2 version

parents 7a067ec3 61a2507a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Api/MediaFilesParserInterface.php 15 additions, 0 deletions

Api/MediaFilesParserInterface.php
Model/Command/ApplyMediaFiles.php 3 additions, 3 deletions

Model/Command/ApplyMediaFiles.php
Model/Config/Parser/ContentParser.php 7 additions, 7 deletions

Model/Config/Parser/ContentParser.php
Model/Config/Parser/Query/FetchMediaFilesChain.php 50 additions, 0 deletions

Model/Config/Parser/Query/FetchMediaFilesChain.php
Model/Config/Parser/Query/Media/MediaDirectiveFileParser.php 6 additions, 4 deletions

Model/Config/Parser/Query/Media/MediaDirectiveFileParser.php
composer.json 4 additions, 4 deletions

composer.json
etc/di.xml 8 additions, 0 deletions

etc/di.xml

with 93 additions and 18 deletions

Loading

0% Loading 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