tree 589581d2ea23647967137d3a7a333c320c3e24d9
parent e7d50f39289c8f0b19eab414b9d3498e7dfc4115
parent 2affd755a5664a370579e8ee4db05d38f1f7d8c5
author Sean Harrington <sean.harrington@leftfieldlabs.com> 1604331973 -0500
committer Sean Harrington <sean.harrington@leftfieldlabs.com> 1604331973 -0500

[x/go.dev] Merge branch 'staging' of https://partner-code.googlesource.com/go.dev

Change-Id: Ic9f7ecb5ceef798318279995046deef62044b01f

# Conflicts:
#	assets/css/styles.css
#	cmd/events/main.go
#	layouts/learn/section.html
#	layouts/partials/learn/book.html
#	layouts/partials/learn/card.html
#	layouts/partials/learn/selfPacedCard.html
#	static/images/gophers/motorcycle.svg
#	static/images/learn/clis.png
#	static/images/learn/codecademy.png
#	static/images/learn/codelabs.png
#	static/images/learn/concurrency-in-go.png
#	static/images/learn/edureka.png
#	static/images/learn/exercism.png
#	static/images/learn/gophercises.png
#	static/images/learn/introducing-go-book.png
#	static/images/learn/qwiklabs.png
#	static/images/learn/star-rating.png
#	static/images/learn/web-dev.png
X-GoDev-Commit: 0d155e6fb94b36ead8720c031727cab3a4f071b8