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
..
bootstrapping.mdx	website: implement mktg 032 (#9953)	2021-04-07 15:50:38 -04:00
cloud-auto-join.mdx	docs: Clarify serf_lan/retry_join behavior with network segments (#10386)	2021-06-29 18:02:59 +00:00
glossary.mdx	Merge pull request #10437 from christopherlai/patch-1	2021-06-29 18:38:17 +00:00
index.mdx	website: implement mktg 032 (#9953)	2021-04-07 15:50:38 -04:00
manual-bootstrap.mdx	maintenance complete, pending markdown-page component addition	2020-12-16 16:55:23 -05:00
performance.mdx	website: implement mktg 032 (#9953)	2021-04-07 15:50:38 -04:00
ports.mdx	Merge pull request #10527 from hashicorp/rename-main-branch	2021-06-30 17:58:22 -04:00