Daniel Hahler 9d838fa861 Merge branch 'master' into features ... Conflicts: src/_pytest/main.py		2018-11-08 02:48:59 +01:00
..
_pytest	Merge branch 'master' into features	2018-11-08 02:48:59 +01:00
pytest.py	Apply reorder-python-imports to all files	2018-10-25 00:01:29 -07:00