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
..
main.yml	Merge remote-tracking branch 'upstream/master' into mm	2020-01-22 11:03:45 -03:00