Skip to content

Commit e15dd89

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into migrate/contributors
2 parents 1b866d6 + 2e0e0ed commit e15dd89

File tree

18 files changed

+14
-362
lines changed

18 files changed

+14
-362
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12534,6 +12534,15 @@
1253412534
"content",
1253512535
"bug"
1253612536
]
12537+
},
12538+
{
12539+
"login": "Signor1",
12540+
"name": "Signor Dev",
12541+
"avatar_url": "https://avatars.githubusercontent.com/u/94352660?v=4",
12542+
"profile": "https://signor.vercel.app/",
12543+
"contributions": [
12544+
"maintenance"
12545+
]
1253712546
}
1253812547
],
1253912548
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,6 +1916,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19161916
</tr>
19171917
<tr>
19181918
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MaryNfs"><img src="https://avatars.githubusercontent.com/u/52598322?v=4?s=100" width="100px;" alt="MaryNfs"/><br /><sub><b>MaryNfs</b></sub></a><br /><a href="#content-MaryNfs" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMaryNfs" title="Bug reports">🐛</a></td>
1919+
<td align="center" valign="top" width="14.28%"><a href="https://signor.vercel.app/"><img src="https://avatars.githubusercontent.com/u/94352660?v=4?s=100" width="100px;" alt="Signor Dev"/><br /><sub><b>Signor Dev</b></sub></a><br /><a href="#maintenance-Signor1" title="Maintenance">🚧</a></td>
19191920
</tr>
19201921
</tbody>
19211922
</table>

public/_redirects

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,5 @@
173173
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
174174

175175
/*/deprecated-software /:splat/dapps/ 301!
176+
177+
/*/enterprise/private-ethereum/ /:splat/enterprise/ 301!

public/content/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

public/content/translations/de/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

public/content/translations/es/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

public/content/translations/fr/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

public/content/translations/hu/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

public/content/translations/id/enterprise/private-ethereum/index.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)