Daniel Hahler 450409d123 Merge master into features ...

Conflicts:
	src/_pytest/reports.py
        (via 7259c453d, moved the type annotation; setting it to `None`
        was removed in 3c82b1cb9 already)

2019-09-17 12:46:36 +02:00

4.0 KiB

Raw Blame History

View Raw