Merge branch 'master' into patch-11

PrernaSingh587 · web-flow · commit b0337db7f941 · 2021-05-15T19:42:42.000+05:30
diff --git a/src/maintainer/maintainer_faq.rst b/src/maintainer/maintainer_faq.rst
@@ -115,3 +115,4 @@ This message can be safely ignored as conda-forge doesn't use conda-verify.
 :ref:`(Q) <mfaq_package_submit>` **Is it necessary for me to be a maintainer of the package I submit to Conda-forge?**
 	Everybody can submit a package to Conda-forge, irrespective of whether they maintain it or not. Additionally, it’s not required but considered a good practice to inform the upstream of a new package and invite them to be maintainers as well.
 
+

Original file line number	Diff line number	Diff line change
`@@ -115,3 +115,4 @@ This message can be safely ignored as conda-forge doesn't use conda-verify.`
`115`	`115`	:ref:`(Q) <mfaq_package_submit>` Is it necessary for me to be a maintainer of the package I submit to Conda-forge?
`116`	`116`	`Everybody can submit a package to Conda-forge, irrespective of whether they maintain it or not. Additionally, it’s not required but considered a good practice to inform the upstream of a new package and invite them to be maintainers as well.`
`117`	`117`
	`118`	`+`