Daniel Hahler 09bdbffbde Merge master into features ...

Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py

2020-01-24 23:44:50 +01:00

..

main.yml

Merge master into features

2020-01-24 23:44:50 +01:00