consul/website/content/docs/connect/proxies
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
..
built-in.mdx Merge pull request #10219 from hashicorp/dnephin/connect-docs 2021-05-10 21:01:47 +00:00
envoy.mdx docs: Add example of escaping tracing JSON using jq 2021-06-14 23:24:19 +00:00
index.mdx website: implement mktg 032 (#9953) 2021-04-07 15:50:38 -04:00
integrate.mdx Merge pull request #10527 from hashicorp/rename-main-branch 2021-06-30 17:58:22 -04:00
managed-deprecated.mdx maintenance complete, pending markdown-page component addition 2020-12-16 16:55:23 -05:00