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

Added standard code of conduct file #129

Merged

Conversation

helpfulrobot
Copy link

Hello!

I'm helpful robot. Ever seen two robots fighting over code? That's because most of us know the robot code of conduct. Did you know SilverStripe has a code of conduct, for community interaction?

Have a nice day! [tick tick tick]

@helpfulrobot helpfulrobot force-pushed the add-standard-code-of-conduct-file branch from 5ffb220 to 135b248 Compare February 15, 2016 23:18
Copy link
Contributor

@robbieaverill robbieaverill left a comment

Choose a reason for hiding this comment

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

This can be merged whenever, but needs to have the branch updated. I can't merge via command line due to a protected branch hook on master, and this PR doesn't allow me to push to the fork.

@dhensby
Copy link
Contributor

dhensby commented Jan 10, 2018

looks like a cherry-pick and new PR / direct push is needed...

@robbieaverill robbieaverill merged commit 978fda3 into symbiote:master Jan 25, 2018
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.

3 participants