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

Adding the basics #3

Merged
merged 2 commits into from
Aug 23, 2017
Merged

Conversation

dannylamb
Copy link
Contributor

PR template, license, contributing.md, and travis setup

@dannylamb
Copy link
Contributor Author

Expecting this to explode because of coding standards

@dannylamb
Copy link
Contributor Author

dannylamb commented Aug 22, 2017

As expected, totally failing because of coding standards. I'll go ahead and patch it up here so everything is passing, but I'm going to rebase it to keep the standards commits separate.

@Islandora-CLAW/committers when I do that, please don't squash and merge this PR. Just do a normal merge.

@DiegoPino
Copy link
Contributor

Ok. Will try to merge on my way home

@DiegoPino
Copy link
Contributor

@dannylamb if you need help with dcs give me a ping.

@dannylamb
Copy link
Contributor Author

@DiegoPino We're green thanks to phpcbf. Please don't squash so the coding standards changes are isolated.

Copy link
Contributor

@DiegoPino DiegoPino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving and not squashing

@DiegoPino
Copy link
Contributor

@dannylamb simple merge or you prefer the rebase and merge?

@dannylamb
Copy link
Contributor Author

@DiegoPino Simple merge will do just fine.

@DiegoPino DiegoPino merged commit 7b5624b into islandora-deprecated:8.x-1.x Aug 23, 2017
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.

2 participants