aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Sozeau2018-12-21 12:15:22 +0100
committerMatthieu Sozeau2018-12-21 12:15:22 +0100
commitd501e6f301f1c023e57f14ee3441553c530d9394 (patch)
tree18454984d4c305734e4c0ca4ac032dd671b16b9e
parentba6b5839add7587837b4cea890f2d505ce76d489 (diff)
parentf16f8d1151aa08abc9444f46e6e3a53033f64168 (diff)
Merge PR #9183: List members of the code of conduct enforcement team.
-rw-r--r--CODE_OF_CONDUCT.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 8eee2009c9..0720cf6210 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -78,7 +78,8 @@ affect a person's ability to participate within them.
If you believe someone is violating the code of conduct, we ask that you report
it by emailing the Coq Code of Conduct enforcement team at
-<coq-conduct@inria.fr>. Confidentiality with regard to the reporter of an
+<coq-conduct@inria.fr> or, at your discretion, any member of the team.
+Confidentiality with regard to the reporter of an
incident will be maintained while dealing with it.
In particular, you should seek support from the team instead of dealing by
@@ -96,6 +97,11 @@ behavior is wrong). We consider short bans to form part of the pedagogical
approach, especially when they come with explanatory comments, as this can give
some time to the offender to calm down and think about their actions.
+The members of the team are currently:
+
+- Matthieu Sozeau
+- Théo Zimmermann
+
## Questions? ##
If you have questions, feel free to write to <coq-conduct@inria.fr>.