Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures

Browse Source

...

This commit is contained in:

Bruno Oliveira

2016-07-11 20:04:23 -03:00

parent 8ed055efd8 6f68dfcc47

commit fb4da00a32

9 changed files with 1391 additions and 1318 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1321

_pytest/python.py

File diff suppressed because it is too large Load Diff