Merge pull request #8 from spoonben/update-code-of-conduct

update code of conduct copy
This commit is contained in:
Ben Spoon 2016-08-10 17:07:42 -07:00 committed by GitHub
commit 49571ac5e8

View file

@ -18,7 +18,7 @@ Examples of unacceptable behavior by participants include:
* Personal attacks * Personal attacks
* Trolling or insulting/derogatory comments * Trolling or insulting/derogatory comments
* Public or private harassment * Public or private harassment
* Publishing other's private information, such as physical or electronic addresses, without explicit permission * Publishing others' private information, such as physical or electronic addresses, without explicit permission
* Other unethical or unprofessional conduct. * Other unethical or unprofessional conduct.
Project maintainers have the right and responsibility to remove, edit, or Project maintainers have the right and responsibility to remove, edit, or
@ -43,7 +43,7 @@ http://contributor-covenant.org/version/1/2/0/
### CoreOS Events Code of Conduct ### CoreOS Events Code of Conduct
CoreOS events are working conference intended for professional networking and CoreOS events are working conferences intended for professional networking and
collaboration in the CoreOS community. Attendees are expected to behave collaboration in the CoreOS community. Attendees are expected to behave
according to professional standards and in accordance with their employers according to professional standards and in accordance with their employers
policies on appropriate workplace behavior. policies on appropriate workplace behavior.