Kale Kundert 5ceee08590 Fix CHANGELOG merge conflicts.		2016-03-14 11:55:50 -07:00
..
approx.py	Fix Decimal() and __ne__() errors.	2016-03-11 16:29:18 -08:00
collect.py	Fix skip/xfail markers in parametrized arguments	2016-02-25 19:13:09 -03:00
fixture.py	Allow custom fixture names for fixtures	2016-03-09 14:58:54 -08:00
integration.py	Moved py.code code over to py.test	2016-01-25 23:18:04 -02:00
metafunc.py	Moved py.code code over to py.test	2016-01-25 23:18:04 -02:00
raises.py	Add expected exceptions to 'DID NOT RAISE' msg	2016-02-03 14:12:41 +03:00