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.

Sign up for GitHub

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

Jump to bottom

Add composer.json #166

Merged
merged 1 commit into from Oct 5, 2016
Merged

Add composer.json #166

merged 1 commit into from Oct 5, 2016

Conversation

dosten
Copy link
Contributor

@dosten dosten commented Oct 4, 2016

This PR fixes #163

@dosten dosten mentioned this pull request Oct 4, 2016
Closed
@salcode
Copy link
Owner

salcode commented Oct 4, 2016

@dosten I appreciate your work on this and I apologize it is prolonged. I'd make this change myself and merge it but then it doesn't count towards your #Hacktoberfest credit.

While I don't want to have composer.lock in .gitignore, I also don't want to introduce the actual file into the repository at this time.

Would you please remove the composer.lock file and squash the commits (with rebase -i again).

Thanks.

@dosten
Add composer.json
5b8a75f 
This PR fixes #163
@dosten
Copy link
Contributor Author

dosten commented Oct 4, 2016

@salcode done

@salcode salcode merged commit 2b28e79 into salcode:develop Oct 5, 2016
@salcode
Copy link
Owner

salcode commented Oct 5, 2016

@dosten

This is perfect, thanks for all your work on this. You rock.

@dosten dosten deleted the composer branch October 5, 2016 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add composer.json
2 participants
@dosten @salcode