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
..
workflows	Merge remote-tracking branch 'upstream/master' into mm	2020-01-22 11:03:45 -03:00
FUNDING.yml	Add Open Collective to FUNDING.yml	2019-06-27 17:53:03 +02:00
ISSUE_TEMPLATE.md	GitHub: revisit issue/PR templates [ci skip]	2019-04-23 18:01:13 +02:00
PULL_REQUEST_TEMPLATE.md	Improve instructions on how to write CHANGELOG entries	2019-11-19 14:15:55 -03:00
config.yml	Add rtd-bot configuration file [skip appveyor] [skip travis]	2019-01-13 20:38:19 -02:00
labels.toml	Manage GH labels using the new 'labels' tool	2018-07-14 10:12:52 -03:00