Commit Graph

5 Commits

Author SHA1 Message Date
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
Bruno Oliveira 018acc6bae Explain why thanks yourself in the CHANGELOG 2016-07-23 10:44:38 -03:00
Dave Hunt ef9dd14963 Introduce pytest command as recommended entry point
Fixes #1629
2016-06-21 16:16:57 +02:00
Bruno Oliveira b46c7dddaa Fix 'check' in markdown for github templates 2016-03-11 18:22:15 -03:00
Bruno Oliveira b76de91474 Add issue and PR GitHub templates 2016-02-18 18:26:38 -02:00