Skip to content

Commit 161fdaf

Browse files
authored
Merge branch 'ethereum:dev' into layout
2 parents 39d2864 + b17088f commit 161fdaf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+11567
-12913
lines changed

.all-contributorsrc

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9718,6 +9718,62 @@
97189718
"doc",
97199719
"ideas"
97209720
]
9721+
},
9722+
{
9723+
"login": "aguzmant103",
9724+
"name": "aguzmant103",
9725+
"avatar_url": "https://avatars.githubusercontent.com/u/67167307?v=4",
9726+
"profile": "https://github.com/aguzmant103",
9727+
"contributions": [
9728+
"doc"
9729+
]
9730+
},
9731+
{
9732+
"login": "soheil555",
9733+
"name": "Soheil",
9734+
"avatar_url": "https://avatars.githubusercontent.com/u/22212139?v=4",
9735+
"profile": "https://soheil.vercel.app/",
9736+
"contributions": [
9737+
"code"
9738+
]
9739+
},
9740+
{
9741+
"login": "metadiver",
9742+
"name": "metadiver.eth",
9743+
"avatar_url": "https://avatars.githubusercontent.com/u/75746881?v=4",
9744+
"profile": "http://linktr.ee/metadiver",
9745+
"contributions": [
9746+
"code"
9747+
]
9748+
},
9749+
{
9750+
"login": "nuclearfalcon",
9751+
"name": "Jacob",
9752+
"avatar_url": "https://avatars.githubusercontent.com/u/12568736?v=4",
9753+
"profile": "https://github.com/nuclearfalcon",
9754+
"contributions": [
9755+
"ideas",
9756+
"doc"
9757+
]
9758+
},
9759+
{
9760+
"login": "theSamPadilla",
9761+
"name": "Sam Padilla",
9762+
"avatar_url": "https://avatars.githubusercontent.com/u/35386211?v=4",
9763+
"profile": "https://github.com/theSamPadilla",
9764+
"contributions": [
9765+
"doc"
9766+
]
9767+
},
9768+
{
9769+
"login": "terasum",
9770+
"name": "Chen Quan",
9771+
"avatar_url": "https://avatars.githubusercontent.com/u/20042193?v=4",
9772+
"profile": "https://chenquan.me",
9773+
"contributions": [
9774+
"doc",
9775+
"translation"
9776+
]
97219777
}
97229778
],
97239779
"contributorsPerLine": 7,

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15271527
</tr>
15281528
<tr>
15291529
<td align="center"><a href="http://olshansky.info"><img src="https://avatars.githubusercontent.com/u/1892194?v=4?s=100" width="100px;" alt="Daniel Olshansky"/><br /><sub><b>Daniel Olshansky</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Olshansk" title="Documentation">📖</a> <a href="#ideas-Olshansk" title="Ideas, Planning, & Feedback">🤔</a></td>
1530+
<td align="center"><a href="https://github.com/aguzmant103"><img src="https://avatars.githubusercontent.com/u/67167307?v=4?s=100" width="100px;" alt="aguzmant103"/><br /><sub><b>aguzmant103</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aguzmant103" title="Documentation">📖</a></td>
1531+
<td align="center"><a href="https://soheil.vercel.app/"><img src="https://avatars.githubusercontent.com/u/22212139?v=4?s=100" width="100px;" alt="Soheil"/><br /><sub><b>Soheil</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soheil555" title="Code">💻</a></td>
1532+
<td align="center"><a href="http://linktr.ee/metadiver"><img src="https://avatars.githubusercontent.com/u/75746881?v=4?s=100" width="100px;" alt="metadiver.eth"/><br /><sub><b>metadiver.eth</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=metadiver" title="Code">💻</a></td>
1533+
<td align="center"><a href="https://github.com/nuclearfalcon"><img src="https://avatars.githubusercontent.com/u/12568736?v=4?s=100" width="100px;" alt="Jacob"/><br /><sub><b>Jacob</b></sub></a><br /><a href="#ideas-nuclearfalcon" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=nuclearfalcon" title="Documentation">📖</a></td>
1534+
<td align="center"><a href="https://github.com/theSamPadilla"><img src="https://avatars.githubusercontent.com/u/35386211?v=4?s=100" width="100px;" alt="Sam Padilla"/><br /><sub><b>Sam Padilla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=theSamPadilla" title="Documentation">📖</a></td>
1535+
<td align="center"><a href="https://chenquan.me"><img src="https://avatars.githubusercontent.com/u/20042193?v=4?s=100" width="100px;" alt="Chen Quan"/><br /><sub><b>Chen Quan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=terasum" title="Documentation">📖</a> <a href="#translation-terasum" title="Translation">🌍</a></td>
15301536
</tr>
15311537
</tbody>
15321538
</table>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "6.12.1",
3+
"version": "6.14.0",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",
Lines changed: 3 additions & 1 deletion
Loading
Lines changed: 3 additions & 1 deletion
Loading
Lines changed: 3 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)