Bruno Oliveira 6c9011c12f Merge branch 'master' into merge-master-into-features-post-3.0.7		2017-03-14 18:10:23 -03:00
..
assertion	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
costlysetup	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
nonpython	Sort yml items to get same results for regendoc runs	2016-08-01 20:09:35 -04:00
py2py3	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
attic.rst	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
conftest.py	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
index.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
markers.rst	Merge branch 'master' into merge-master-into-features-post-3.0.7	2017-03-14 18:10:23 -03:00
multipython.py	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
nonpython.rst	Update regendoc	2017-03-13 18:41:20 -04:00
parametrize.rst	Merge branch 'master' into merge-master-into-features-post-3.0.7	2017-03-14 18:10:23 -03:00
pythoncollection.py	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
pythoncollection.rst	Merge branch 'master' into merge-master-into-features-post-3.0.7	2017-03-14 18:10:23 -03:00
reportingdemo.rst	Merge branch 'master' into merge-master-into-features-post-3.0.7	2017-03-14 18:10:23 -03:00
simple.rst	Merge branch 'master' into merge-master-into-features-post-3.0.7	2017-03-14 18:10:23 -03:00
special.rst	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
xfail_demo.py	finalize pytest-2.6.1 release, regen docs	2014-08-07 21:41:51 +02:00