Merge remote-tracking branch 'upstream/features' into jonozzz/features

Browse Source

...

This commit is contained in:

Bruno Oliveira

2018-07-05 18:15:17 -03:00

parent 7d0dba18de 3f5e06ecc4

commit 3c19370cec

288 changed files with 16932 additions and 12480 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

1412

src/_pytest/python.py Normal file

File diff suppressed because it is too large Load Diff