Bruno Oliveira c2864aba3d Merge branch 'master' into merge-master ... # Conflicts: # AUTHORS # CHANGELOG.rst # _pytest/monkeypatch.py # _pytest/python.py		2016-07-25 19:06:29 -03:00
..
ISSUE_TEMPLATE.md	Introduce pytest command as recommended entry point	2016-06-21 16:16:57 +02:00
PULL_REQUEST_TEMPLATE.md	Explain why thanks yourself in the CHANGELOG	2016-07-23 10:44:38 -03:00