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

refs #821 modified config.xml to prevent 404 page. #823

Merged
merged 2 commits into from
Jun 24, 2015
Merged

Conversation

miguelbalparda
Copy link
Contributor

No description provided.

miguelbalparda added a commit that referenced this pull request Jun 24, 2015
refs #821 modified config.xml to prevent 404 page.
@miguelbalparda miguelbalparda merged commit 684e49b into master Jun 24, 2015
fredden added a commit to fredden/magento-turpentine that referenced this pull request Apr 20, 2019
This was introduced in nexcess#817,
but this conflicted with the existing controller. This conflict was identified
in nexcess#821 and resolved in
nexcess#823 by removing this line.
Without this line, the overridden controller is not used (and therefore the
protection it adds is not being applied).

This change reintroduces the required configuration in a non-conflicting way.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant