Merge pull request #8149 from pytest-dev/release-6.2.1#8151

Merged

nicoddemus merged 1 commit intopytest-dev:masterfrom nicoddemus:cherry-pick-release

Dec 15, 2020

+44-13

Commits on Dec 15, 2020

Merge pull request pytest-dev#8149 from pytest-dev/release-6.2.1
nicoddemus
committed