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

Use default catalog as a fallback #7144

Merged
merged 2 commits into from Dec 5, 2016

Conversation

@maximebiloe
Copy link
Contributor

commented Dec 2, 2016

Questions Answers
Branch? 1.7.0.x
Description? Do not set a fallbackCatalog, use the original strings
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? http://forge.prestashop.com/browse/BOOM-1750

@maximebiloe maximebiloe added this to the 1.7.0.3 milestone Dec 2, 2016

@maximebiloe maximebiloe changed the base branch from develop to 1.7.0.x Dec 2, 2016

@maximebiloe

This comment has been minimized.

Copy link
Contributor Author

commented Dec 2, 2016

See #6912

@maximebiloe maximebiloe force-pushed the PrestaShop:1.7.0.x branch from 9798dc8 to c5a13b4 Dec 2, 2016

@aleeks

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2016

Could you rebase please @maximebiloe

@maximebiloe maximebiloe force-pushed the maximebiloe:fix-default-catalog-17 branch from 02ee607 to 9274f74 Dec 5, 2016

@maximebiloe

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2016

@aleeks done 😉

@aleeks

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2016

Thank you @maximebiloe

@aleeks aleeks merged commit 04354a4 into PrestaShop:1.7.0.x Dec 5, 2016

1 check passed

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

@aleeks aleeks deleted the maximebiloe:fix-default-catalog-17 branch Dec 5, 2016

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