Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

magento/magento2#7860: Invalid comment for the method __order in Mage… #8769

Merged
merged 4 commits into from
Mar 23, 2017
Merged

Conversation

mcspronko
Copy link
Contributor

@mcspronko mcspronko commented Mar 2, 2017

…nto\Sales\Model\Order\Payment.php

 - added base64_encode function for handles to support /
@okorshenko
Copy link
Contributor

Hi @mcspronko
Could you please resolve the code conflict so that we can process this RP?

# Conflicts:
#	app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php
@mcspronko
Copy link
Contributor Author

@okorshenko please check updated version.

@okorshenko
Copy link
Contributor

@mcspronko thank you.
Does this PR include changes from #8773 ?

@okorshenko
Copy link
Contributor

Is a fix for #7860

@mcspronko
Copy link
Contributor Author

@okorshenko yes, my mistake.

@okorshenko
Copy link
Contributor

That is ok. Don't worry. We will accept it as is
Is a fix for #8596

@ishakhsuvarov
Copy link
Contributor

@mcspronko Thank you for contribution!

magento-devops-reposync-svc pushed a commit that referenced this pull request Mar 19, 2024
[Support Tier-4 vasyliev] 02-16-2024 Regular delivery of bugfixes and improvements
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants