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

F/updated composer installation #6

Merged
merged 2 commits into from
Feb 3, 2015

Conversation

justinyost
Copy link
Contributor

This is a branch for adding in .editorconfig files and the Composer installer name

beporter added a commit that referenced this pull request Feb 3, 2015
@beporter beporter merged commit 16f2b81 into cake-2.x Feb 3, 2015
@beporter beporter deleted the f/updated-composer-installation branch February 3, 2015 18:25
@beporter
Copy link
Contributor

beporter commented Feb 3, 2015

While we're still applying fixes that potentially apply to both Cake 2 and 3, I'm going to be fast-forwarding the master branch along with cake-2.x. This applies to #1 and #2 in particular, which should technically taget cake-2.x but I will end up "applying" to master as well.

Bottom line: watch your local branches and make sure they don't get auto-merged in a funky way. Stick to git fetch and proceed from there.

@beporter beporter mentioned this pull request Feb 3, 2015
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants