2 Commits

Author	SHA1	Message	Date
Bruno Oliveira	93b74d28d2	Merge remote-tracking branch 'upstream/master' into mm ... Conflicts: * src/_pytest/_code/code.py * src/_pytest/main.py * testing/python/metafunc.py * testing/test_parseopt.py * testing/test_pytester.py	2020-01-22 11:03:45 -03:00
Ronny Pfannschmidt	8feeb09398	fixes #5065	2019-11-27 11:25:23 +01:00