Skip to content

Commit

Permalink
Merge branch 'main' into all-contributors/add-Bumblebee00
Browse files Browse the repository at this point in the history
  • Loading branch information
Qianqianye authored Jan 11, 2024
2 parents 0c8341c + 1e6b0ca commit 8c0d1ae
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 1 deletion.
37 changes: 37 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -5486,6 +5486,43 @@
"code"
]
},
{
"login": "mohamedalisaifudeen",
"name": "mohamedalisaifudeen",
"avatar_url": "https://avatars.githubusercontent.com/u/107266503?v=4",
"profile": "https://github.com/mohamedalisaifudeen",
"contributions": [
"bug"
]
},
{
"login": "aryanas159",
"name": "Aryan Singh",
"avatar_url": "https://avatars.githubusercontent.com/u/114330931?v=4",
"profile": "https://github.com/aryanas159",
"contributions": [
"code"
]
},
{
"login": "nikhilkalburgi",
"name": "nikhilkalburgi",
"avatar_url": "https://avatars.githubusercontent.com/u/70331875?v=4",
"profile": "https://github.com/nikhilkalburgi",
"contributions": [
"bug",
"doc"
]
},
{
"login": "samrudh3125",
"name": "Samrudh Shetty",
"avatar_url": "https://avatars.githubusercontent.com/u/69446481?v=4",
"profile": "https://github.com/samrudh3125",
"contributions": [
"a11y"
]
},
{
"login": "Bumblebee00",
"name": "Mattia Micheletta Merlin",
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,10 @@ We recognize all types of contributions. This project follows the [all-contribut
</tr>
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/sudhanshuv1"><img src="https://avatars.githubusercontent.com/u/148856416?v=4?s=120" width="120px;" alt="Sudhanshu Tiwari"/><br /><sub><b>Sudhanshu Tiwari</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=sudhanshuv1" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/mohamedalisaifudeen"><img src="https://avatars.githubusercontent.com/u/107266503?v=4?s=120" width="120px;" alt="mohamedalisaifudeen"/><br /><sub><b>mohamedalisaifudeen</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Amohamedalisaifudeen" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/aryanas159"><img src="https://avatars.githubusercontent.com/u/114330931?v=4?s=120" width="120px;" alt="Aryan Singh"/><br /><sub><b>Aryan Singh</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=aryanas159" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/nikhilkalburgi"><img src="https://avatars.githubusercontent.com/u/70331875?v=4?s=120" width="120px;" alt="nikhilkalburgi"/><br /><sub><b>nikhilkalburgi</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Anikhilkalburgi" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=nikhilkalburgi" title="Documentation">📖</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/samrudh3125"><img src="https://avatars.githubusercontent.com/u/69446481?v=4?s=120" width="120px;" alt="Samrudh Shetty"/><br /><sub><b>Samrudh Shetty</b></sub></a><br /><a href="#a11y-samrudh3125" title="Accessibility">️️️️♿️</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Bumblebee00"><img src="https://avatars.githubusercontent.com/u/54026028?v=4?s=120" width="120px;" alt="Mattia Micheletta Merlin"/><br /><sub><b>Mattia Micheletta Merlin</b></sub></a><br /><a href="#example-Bumblebee00" title="Examples">💡</a> <a href="https://github.com/processing/p5.js/commits?author=Bumblebee00" title="Code">💻</a> <a href="https://github.com/processing/p5.js/commits?author=Bumblebee00" title="Tests">⚠️</a></td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion contributor_docs/contributor_guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Once the push is complete, you may see a link in the terminal that lets you open
### Pull request information
Before filing the pull request, you will need to fill out the pull request template. First of all the pull request title should briefly describe what the changes are, again avoid generic statements here.

Next, in the template, there is this line `Resolves #[Add issue number here]` which you should replace `[Add issue number here]` with the issue number of the issue you are addressing/fixing [above](#all-about-issues) (eg. `Resolves #1234`). This will make sure the issue is automatically closed after this PR is merged. If you do not wish to automatically close the issue after this PR is merged (maybe because there are more changes coming in a separate PR), change `Resovles` to `Addresses`.
Next, in the template, there is this line `Resolves #[Add issue number here]` which you should replace `[Add issue number here]` with the issue number of the issue you are addressing/fixing [above](#all-about-issues) (eg. `Resolves #1234`). This will make sure the issue is automatically closed after this PR is merged. If you do not wish to automatically close the issue after this PR is merged (maybe because there are more changes coming in a separate PR), change `Resolves` to `Addresses`.

For "Changes", you should give a clear description of the changes you have made in this PR. Include any implementation details and decisions you made here that are relevant to whoever will review this PR.

Expand Down

0 comments on commit 8c0d1ae

Please sign in to comment.