Skip to content

Commit e640f46

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix_all_contributors
# Conflicts: # README.md
2 parents 1aa8ad7 + 61632d3 commit e640f46

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

.all-contributorsrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@
9595
"contributions": [
9696
"translation"
9797
]
98+
},
99+
{
100+
"login": "julio4",
101+
"name": "julio4",
102+
"avatar_url": "https://avatars.githubusercontent.com/u/30329843?v=4",
103+
"profile": "http://julio4.com",
104+
"contributions": [
105+
"code",
106+
"tool"
107+
]
98108
}
99109
],
100110
"contributorsPerLine": 7,

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Remember: Keep a span between the HTML tag and the markdown tag. -->
33

44
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
5-
[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors)
5+
[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors)
66
<!-- ALL-CONTRIBUTORS-BADGE:END -->
77

88
<h1>The Cairo Programming Language Book</h1>
@@ -124,6 +124,7 @@ To run the CI locally, ensure that you are at the root of the repository (same d
124124
<tr>
125125
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cryptonerdcn"><img src="https://avatars.githubusercontent.com/u/97042744?v=4?s=100" width="100px;" alt="cryptonerdcn"/><br /><sub><b>cryptonerdcn</b></sub></a><br /><a href="#translation-cryptonerdcn" title="Translation">🌍</a></td>
126126
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MathiasTELITSINE"><img src="https://avatars.githubusercontent.com/u/95372106?v=4?s=100" width="100px;" alt="Argetlames"/><br /><sub><b>Argetlames</b></sub></a><br /><a href="#translation-MathiasTELITSINE" title="Translation">🌍</a></td>
127+
<td align="center" valign="top" width="14.28%"><a href="http://julio4.com"><img src="https://avatars.githubusercontent.com/u/30329843?v=4?s=100" width="100px;" alt="julio4"/><br /><sub><b>julio4</b></sub></a><br /><a href="https://github.com/cairo-book/cairo-book.github.io/commits?author=julio4" title="Code">💻</a> <a href="#tool-julio4" title="Tools">🔧</a></td>
127128
</tr>
128129
</tbody>
129130
</table>

0 commit comments

Comments
 (0)