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

..

workflows

Merge master into features

2020-01-29 03:07:35 +01:00

config.yml

Add rtd-bot configuration file [skip appveyor] [skip travis]

2019-01-13 20:38:19 -02: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

labels.toml

Manage GH labels using the new 'labels' tool

2018-07-14 10:12:52 -03:00

PULL_REQUEST_TEMPLATE.md

Explicitly state on the PR template that we can squash commits (#6662)

2020-02-03 14:35:50 -03:00