Skip to content

Commit db32d09

Browse files
committed
Merge branch 'dev' into pr/TylerAPfledderer/10100
2 parents fa5b0e2 + f7f7132 commit db32d09

File tree

327 files changed

+11552
-4552
lines changed

Some content is hidden

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

327 files changed

+11552
-4552
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
* @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186 @nhsz
99

1010
# Owners of specific files
11-
/src/data/consensus-bounty-hunters.csv @djrtwo @JustinDrake @asanso @fredriksvantes
11+
/src/data/consensus-bounty-hunters.csv @djrtwo @asanso @fredriksvantes

.github/workflows/chromatic.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ name: Chromatic Publish and Testing
55

66
# Event for the workflow
77
on:
8-
pull_request:
9-
types:
10-
- opened
11-
- synchronize
12-
- ready_for_review
8+
push:
139
paths:
1410
# Only run on file changes in any of these paths
1511
- "src/components/**/*"

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": "7.11.2",
3+
"version": "7.12.1",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",

src/assets/dapps/dexguru.png

39.5 KB
Loading

src/assets/roadmap/roadmap-future.png

290 KB
Loading

src/assets/roadmap/roadmap-main.png

432 KB
Loading
284 KB
Loading
307 KB
Loading

src/assets/roadmap/roadmap-ux.png

265 KB
Loading

src/assets/wallets/shapeshift.png

51 KB
Loading

0 commit comments

Comments
 (0)