Merge pull request #31 from ericchiang/coc

automated PR: update CoC
This commit is contained in:
Stephen Demos 2018-03-27 13:22:21 -07:00 committed by GitHub
commit e409d983eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions

View File

@ -34,8 +34,7 @@ when an individual is representing the project or its community.
Instances of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer, Brandon Philips reported by contacting a project maintainer, Brandon Philips
<brandon.philips@coreos.com>, and/or Meghan Schofield <brandon.philips@coreos.com>, and/or Rithu John <rithu.john@coreos.com>.
<meghan.schofield@coreos.com>.
This Code of Conduct is adapted from the Contributor Covenant This Code of Conduct is adapted from the Contributor Covenant
(http://contributor-covenant.org), version 1.2.0, available at (http://contributor-covenant.org), version 1.2.0, available at
@ -59,5 +58,4 @@ refund) any individual found to be engaging in discriminatory or offensive
speech or actions. speech or actions.
Please bring any concerns to the immediate attention of designated on-site Please bring any concerns to the immediate attention of designated on-site
staff, Brandon Philips <brandon.philips@coreos.com>, and/or Meghan Schofield staff, Brandon Philips <brandon.philips@coreos.com>, and/or Rithu John <rithu.john@coreos.com>.
<meghan.schofield@coreos.com>.