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

Merge master to dev #591

Merged
merged 5 commits into from Jun 16, 2023
Merged

Conversation

matks
Copy link
Contributor

@matks matks commented Jun 16, 2023

Questions Answers
Description? There was git conflicts between dev and master and this prevented to create a Merge PR from dev to master to release 4.16.0 . I fix this git conflicts in this PR.
Type? improvement
BC breaks? no
Deprecations? no
Fixed ticket?
Sponsor company Your company or customer's name goes here (if applicable).
How to test? No need to test

@matks
Copy link
Contributor Author

matks commented Jun 16, 2023

(yes this is an empty-looking PR as it only contains git resolved conflicts)

@jolelievre jolelievre merged commit f0bfc45 into PrestaShop:dev Jun 16, 2023
26 checks passed
@matks matks deleted the merge-master-to-dev-june-2023 branch June 16, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
5 participants