Files
pytest2/testing
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
..
2019-11-06 22:08:10 +01:00
2020-01-16 21:12:48 +01:00
2020-01-16 21:12:48 +01:00
2020-01-15 11:20:00 +01:00
2019-10-22 23:44:52 +02:00
2019-10-21 00:08:03 +02:00
2019-11-16 18:55:32 +01:00