From 95d5155028105fc97aa97f830322501b2fe54450 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sat, 6 Feb 2016 17:06:52 -0800 Subject: [PATCH 1/3] Create code-of-conduct.txt --- code-of-conduct.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 code-of-conduct.txt diff --git a/code-of-conduct.txt b/code-of-conduct.txt new file mode 100644 index 00000000..9c7841aa --- /dev/null +++ b/code-of-conduct.txt @@ -0,0 +1,5 @@ +These guidelines apply to Neocities contributor communications, such as mailing lists, IRC, submitted patches, commit comments, etc. + +* Language and actions must be free of personal attacks, harassment, discrimination, and NSFW content. + +Instances of unacceptable behavior may be reported by contacting the project team at abuse@neocities.org. All complaints will be investigated and reporter confidentiality will be maintained. From aa6132079a23f7814484cdb30cd84723b378c819 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sat, 6 Feb 2016 17:07:42 -0800 Subject: [PATCH 2/3] Update code-of-conduct.txt --- code-of-conduct.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code-of-conduct.txt b/code-of-conduct.txt index 9c7841aa..48e1b71c 100644 --- a/code-of-conduct.txt +++ b/code-of-conduct.txt @@ -1,5 +1,9 @@ -These guidelines apply to Neocities contributor communications, such as mailing lists, IRC, submitted patches, commit comments, etc. +These guidelines apply to Neocities contributor communications, such +as mailing lists, IRC, submitted patches, commit comments, etc. -* Language and actions must be free of personal attacks, harassment, discrimination, and NSFW content. +* Language and actions must be free of personal attacks, harassment, + discrimination, and NSFW content. -Instances of unacceptable behavior may be reported by contacting the project team at abuse@neocities.org. All complaints will be investigated and reporter confidentiality will be maintained. +Instances of unacceptable behavior may be reported by contacting the +project team at abuse@neocities.org. All complaints will be +investigated and reporter confidentiality will be maintained. From e09e925dfa864c69350653c2744ad1455198c94e Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sat, 6 Feb 2016 17:10:48 -0800 Subject: [PATCH 3/3] Update code-of-conduct.txt --- code-of-conduct.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-of-conduct.txt b/code-of-conduct.txt index 48e1b71c..7bc8f141 100644 --- a/code-of-conduct.txt +++ b/code-of-conduct.txt @@ -4,6 +4,6 @@ as mailing lists, IRC, submitted patches, commit comments, etc. * Language and actions must be free of personal attacks, harassment, discrimination, and NSFW content. -Instances of unacceptable behavior may be reported by contacting the +Instances of unacceptable behavior can be reported by contacting the project team at abuse@neocities.org. All complaints will be investigated and reporter confidentiality will be maintained.