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

[1.4] Fixed bad merge #1089

Merged
merged 4 commits into from Aug 11, 2020
Merged

[1.4] Fixed bad merge #1089

merged 4 commits into from Aug 11, 2020

Conversation

GrahamCampbell
Copy link
Contributor

@GrahamCampbell GrahamCampbell commented Aug 11, 2020

This PR is how I intended to 1.3 -> master merge to go. ;)

@GrahamCampbell GrahamCampbell marked this pull request as ready for review August 11, 2020 11:12
@davedevelopment
Copy link
Collaborator

Sorry, I go on holiday on Friday so rushed through it 😂

@davedevelopment davedevelopment merged commit 12172ac into mockery:master Aug 11, 2020
@GrahamCampbell GrahamCampbell deleted the patch-1 branch August 11, 2020 12:03
@GrahamCampbell
Copy link
Contributor Author

No worries. :)

@GrahamCampbell
Copy link
Contributor Author

I'll test the current 1.3 and master branches with laravel, then send release PRs. :)

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.

None yet

2 participants