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

[Mailer] Added missing PHPDoc argument #8725

Merged
merged 1 commit into from
Sep 22, 2017
Merged

[Mailer] Added missing PHPDoc argument #8725

merged 1 commit into from
Sep 22, 2017

Conversation

sweoggy
Copy link
Contributor

@sweoggy sweoggy commented Sep 22, 2017

Q A
Bug fix? yes
New feature? no
BC breaks? no
Related tickets N/A
License MIT

@pamil pamil added this to the 1.0 milestone Sep 22, 2017
@pamil pamil added the Maintenance CI configurations, READMEs, releases, etc. label Sep 22, 2017
@pamil pamil changed the base branch from master to 1.0 September 22, 2017 11:44
@pamil
Copy link
Contributor

pamil commented Sep 22, 2017

Thanks @sweoggy, can you rebase it to 1.0?

@sweoggy
Copy link
Contributor Author

sweoggy commented Sep 22, 2017

@pamil done.

For anyone's reference, I did the following to rebase it:
git fetch upstream
git pull --rebase upstream 1.0
git rebase -i HEAD~3 (in case of leftovers from master branch, where 3 = the amount of bad commits + own commits)
git push --force

@pamil pamil merged commit b1652d3 into Sylius:1.0 Sep 22, 2017
@pamil
Copy link
Contributor

pamil commented Sep 22, 2017

Thanks Oscar! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants