Files
pytest2/src/_pytest
Daniel Hahler b5b710b3ae Merge master into features
Several conflicts, mostly due to 2c402f4bd.

Conflicts:
	.pre-commit-config.yaml
	src/_pytest/outcomes.py
	src/_pytest/python_api.py
	tox.ini
2019-08-02 16:52:51 +02:00
..
2019-08-02 16:52:51 +02:00
2019-08-02 16:52:51 +02:00
2019-07-09 12:12:07 -07:00
2019-08-02 16:52:51 +02:00
2019-07-09 19:04:06 -03:00
2019-06-30 13:18:07 -03:00
2019-06-15 10:06:37 -03:00
2019-06-30 13:18:07 -03:00
2019-07-11 20:11:06 -03:00
2019-08-02 16:52:51 +02:00
2019-08-02 16:52:51 +02:00
2019-07-14 14:28:24 +03:00
2019-07-09 12:12:07 -07:00
2019-07-27 21:06:29 +02:00
2019-07-09 19:04:06 -03:00
2019-08-02 16:52:51 +02:00
2019-06-30 13:31:39 -03:00