Daniel Nephin 374072d1ee Merge pull request #10527 from hashicorp/rename-main-branch ... Update references to the main branch Conflicts: .github/CONTRIBUTING.md website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx The website conflicts seems like it some of the changes on main didn't make it into the 1.10.x branch, but the content is relevant for 1.10 so I took the changes from main.		2021-06-30 17:58:22 -04:00
..
docker	ui: Bump node to v14 (#10238)	2021-05-18 15:35:54 +00:00
functions	Merge pull request #10527 from hashicorp/rename-main-branch	2021-06-30 17:58:22 -04:00
scripts	xds: ensure that all envoyproxy/go-control-plane protobuf symbols are linked into the final binary (#10131)	2021-04-29 19:58:58 +00:00