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 1.7.6.x to develop - 05/07/2019 #14510

Merged
merged 8 commits into from Jul 6, 2019

Conversation

@matks
Copy link
Contributor

commented Jul 5, 2019

Questions Answers
Branch? develop
Description? Merge of bug fixes from 1.7.6.x branch to develop as we are in code freeze
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Travis should be green

This change is Reviewable

jolelievre and others added some commits Jul 3, 2019

Merge pull request #14460 from jolelievre/ignore-index-in-entites
Ignore index.php files in Doctrine entities scanning
Merge pull request #14503 from matks/publish-1760-rc2
Update changelog for 1.7.6.0 RC 2

@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Jul 5, 2019

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jul 5, 2019

You're bored? 😸

@matks

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2019

You're bored? 😸

And you :trollface: ?

@PrestaShop PrestaShop deleted a comment from prestonBot Jul 6, 2019

@matks matks added this to the 1.7.7.0 milestone Jul 6, 2019

@matks matks merged commit 7c26c92 into PrestaShop:develop Jul 6, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@matks matks deleted the matks:merge176xtodevelop-32 branch Jul 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.