Merge branch 'master' of github.com:neocities/neocities

This commit is contained in:
Kyle Drake 2016-02-11 19:55:41 -08:00
commit a868312bb4

View file

@ -1,9 +1,9 @@
These guidelines apply to Neocities contributor communications, such These guidelines apply to Neocities contributor communications, including
as mailing lists, IRC, submitted patches, commit comments, etc. messages in code repositories, collaboration tools, outreach channels, etc.
* Language and actions must be free of personal attacks, harassment, * Language and actions must be free of personal attacks, harassment,
discrimination, and NSFW content. discrimination, and NSFW content.
Instances of unacceptable behavior can be reported by contacting the Instances of unacceptable behavior can be reported by contacting the project
project team at abuse@neocities.org. All complaints will be team at abuse@neocities.org. All complaints will be investigated and reporter
investigated and reporter confidentiality will be maintained. confidentiality will be maintained.