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
..
en	Merge remote-tracking branch 'upstream/master' into mm	2020-02-11 19:22:28 -03:00