Skip to content

Commit 37ead5e

Browse files
authored
Merge pull request #1046 from rkingsbury/coc
update Code of Conduct to MPSF version
2 parents f321f2a + cbdba39 commit 37ead5e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@ when an individual is representing the project or its community.
3636

3737
Instances of abusive, harassing, or otherwise unacceptable behavior may be
3838
reported by contacting a project maintainer at conduct@materialsproject.org. All
39-
complaints will be reviewed and investigated and will result in a response that
40-
is deemed necessary and appropriate to the circumstances. Maintainers are
41-
obligated to maintain confidentiality with regard to the reporter of an
42-
incident to the extent possible by law and institutional policy.
43-
39+
complaints will be reviewed and investigated by a Materials Project staff member
40+
and will result in a response that
41+
is deemed necessary and appropriate to the circumstances.
42+
43+
Project maintainers and Materials Project staff members are obligated to
44+
maintain confidentiality with regard to the reporter of an incident to the extent
45+
possible by law and institutional policy. Community members should be aware that Materials Project
46+
staff members are subject to Lawrence Berkeley National Laboratory's [harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/),
47+
which require that reports of sexual violence or harassment (as defined in the policy)
48+
be reported to the institution.
4449

4550
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
4651
version 1.3.0, available at https://www.contributor-covenant.org/version/1/3/0/code-of-conduct.html

0 commit comments

Comments
 (0)