Files
pytest2/testing
Bruno Oliveira 78baa7b575 Merge remote-tracking branch 'upstream/master' into mm
Conflicts:
	src/_pytest/main.py
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/test_main.py
	testing/test_parseopt.py
2020-02-11 19:22:28 -03:00
..
2019-11-06 22:08:10 +01:00
2020-01-15 11:20:00 +01:00
2019-11-16 18:55:32 +01:00