Bruno Oliveira b62aef3372 Merge branch 'master' into features		2017-07-04 12:44:58 -03:00
..
2147.removal	Add changelog entry explicitly deprecating old-style classes from pytest API	2017-06-24 00:37:40 -03:00
2427.removal	introduce deprecation warnings for legacy parametersets, fixes #2427	2017-06-23 22:06:49 +02:00
2489.trivial	changelog fragment	2017-06-11 14:17:40 +02:00
2516.feature	fixup changelog, thanks Bruno	2017-06-23 11:09:16 +02:00
2528.feature	allow staticmethods to be detected as test functions	2017-06-29 07:44:36 -04:00
_template.rst	Show "trivial" category in CHANGELOG	2017-06-23 12:33:50 -03:00