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
..
ISSUE_TEMPLATE	Adding redirect to discuss, moving question to old (#7732)	2020-05-01 13:02:15 -04:00
workflows	Merge pull request #10527 from hashicorp/rename-main-branch	2021-06-30 17:58:22 -04:00
CONTRIBUTING.md	Merge pull request #10527 from hashicorp/rename-main-branch	2021-06-30 17:58:22 -04:00
issue-labeler.yml	Remove auto-docs-cherrypick and update UI label (#9047)	2020-10-27 10:24:05 -04:00
pr-labeler.yml	Update pr-labeler to new NIA docs path (#9501)	2021-01-05 12:15:10 -06:00
repo_management.md	Fixes README overwrite (#8821)	2020-10-05 15:32:57 -04:00