8000 fixed wrong merge by fabpot · Pull Request #13427 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

fixed wrong merge #13427

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

Merged
merged 1 commit into from
Jan 16, 2015
Merged

fixed wrong merge #13427

merged 1 commit into from
Jan 16, 2015

Conversation

fabpot
Copy link
Member
@fabpot fabpot commented Jan 16, 2015
Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? no
Fixed tickets n/a
License MIT
Doc PR n/a

@fabpot fabpot force-pushed the fix-wrong-merge branch 3 times, most recently from d989b30 to 238bbab Compare January 16, 2015 07:12
@fabpot fabpot merged commit 238bbab into symfony:master Jan 16, 2015
fabpot added a commit that referenced this pull request Jan 16, 2015
This PR was merged into the 3.0-dev branch.

Discussion
----------

fixed wrong merge

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

238bbab fixed wrong merge
@fabpot fabpot deleted the fix-wrong-merge branch February 12, 2015 09:33
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
0