Skip to content

Add Ethereum energy consumption page #3650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minimalsm merged 25 commits into from
Dec 14, 2021
Merged

Add Ethereum energy consumption page #3650

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e97239c
add energy consumption page
jmcook1186 Aug 18, 2021
1bfdfc5
update index.md
jmcook1186 Aug 18, 2021
2e811b1
Merge branch 'ethereum:dev' into dev
jmcook1186 Aug 18, 2021
9c22ab9
Merge branch 'ethereum:dev' into dev
jmcook1186 Aug 19, 2021
1bfa4a0
Merge branch 'ethereum:dev' into dev
jmcook1186 Sep 7, 2021
8258e28
Merge branch 'ethereum:dev' into dev
jmcook1186 Sep 8, 2021
840e228
amended according to PR review comments
jmcook1186 Sep 15, 2021
d63b5bc
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
2079d73
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
414459c
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
297c29d
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
84c8b1e
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
efb04d3
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
58ab148
Update src/content/energy_consumption/index.md
minimalsm Sep 17, 2021
e4f0abe
correct error in no. beacon validators
jmcook1186 Sep 17, 2021
7000f9b
Merge branch 'dev' of https://github.com/jmcook1186/ethereum-org-webs…
jmcook1186 Sep 17, 2021
73e352d
Apply suggestions from code review
minimalsm Nov 2, 2021
ea0e63b
Update index.md
minimalsm Nov 2, 2021
68e4ab7
Merge branch 'ethereum:dev' into dev
jmcook1186 Nov 3, 2021
23e7da7
Merge branch 'ethereum:dev' into dev
jmcook1186 Nov 9, 2021
23a75fc
Updates based on suggestions
minimalsm Nov 9, 2021
7a61402
add refs as per PR review comments
jmcook1186 Nov 9, 2021
2618438
add refs
jmcook1186 Nov 10, 2021
eaa529f
Apply suggestions from code review
minimalsm Dec 9, 2021
fee0828
Update src/content/energy_consumption/index.md
minimalsm Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'ethereum:dev' into dev
  • Loading branch information
@jmcook1186
jmcook1186 authored Sep 8, 2021
commit 8258e2896db278c54db35ac514a1cbe7eaa371ed

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.