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 changes from D6LTS Pressflow fork #131

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

dsnopek
Copy link
Contributor

@dsnopek dsnopek commented Jun 5, 2019

This is just merging the latest D6LTS changes from the D6LTS projects Pressflow fork. It's mostly the just the D6LTS changes themselves, but it looks like where we diverged was on the CHANGELOG.txt.

We ended up swapping out the original Pressflow changelog for ours, so that (in most cases) the same patches could be easily applied to be both D6LTS and Pressflow without conflicts.

If this PR won't be merged because of that, I could revert that change. When patches touch parts of the code that are different between vanilla Drupal and Pressflow, then separate patches are needed anyway, but it's nice that in most cases we can get away with just one patch. :-)

Please let me know what you think!

@pwolanin
Copy link
Contributor

pwolanin commented Jun 5, 2019

@dsnopek I don't care really about the Changelog myself.

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.

2 participants