Skip to content

Commit

Permalink
Merge branch 'main' into joesepi-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
joesepi authored Apr 28, 2023
2 parents 50a629a + 361b0c1 commit e284ace
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Code of Conduct

The OpenJS Foundation and its member projects use [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included [below](#contributor-covenant-code-of-conduct-v20) in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.
The OpenJS Foundation and its member projects use [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included below in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.

## Commitment

All recipients of reports commit to:

- maintain the confidentiality with regard to the reporter and victim of an incident, and
- participate in the path for escalation as outlined in the section on Escalation when required.
- maintain the confidentiality with regard to the reporter and victim of an incident
- participate in the path for escalation as outlined in the section on Escalation when required

## Report an issue in a project

Expand Down
2 changes: 1 addition & 1 deletion conduct/artifacts/CODE_OF_CONDUCT_PREAMBLE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code of Conduct

The OpenJS Foundation and its member projects use a modified version of the Contributor Covenant as their code of conduct, and the translations from the original script will not reflect all modifications. The full text is included below in English, and [the original translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.
The OpenJS Foundation and its member projects use [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included below in English, and [translations](https://www.contributor-covenant.org/translations) are available on the Contributor Covenant website.

## Commitment

Expand Down
2 changes: 1 addition & 1 deletion meetings/2021/2021-10-26.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Private Session

### Announcements

* jQuery Story in New Stack - check it out! https://thenewstack.io/why-outdated-jquery-is-still-the-dominant-javascript-library/
* jQuery Story in New Stack - check it out! https://web.archive.org/web/20221205165626/https://thenewstack.io/why-outdated-jquery-is-still-the-dominant-javascript-library/
* Reminder - attend Programming Committee calls on Thursdays to get involved with OpenJS World planning
* Node.js v. 17 release out last week, Node 16 moving to LTS today!
* Thank you to the LiFT applicants and to the Node Mentorship team for reviewing - hope to have announcements out for receipients soon!
Expand Down

0 comments on commit e284ace

Please sign in to comment.