diff options
author | Bruno Oliveira <nicoddemus@gmail.com> | 2019-04-05 14:28:48 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-05 14:28:48 -0300 |
commit | b54943842363c261730b2fce8edbe92d1b9ba84a (patch) | |
tree | 7902c631d62b87c935cda427454cf0bc16c59c69 /src/_pytest/skipping.py | |
parent | 87ce586d297dfe0c1ece0e116aff176c7ee99559 (diff) | |
parent | 377888140f0f83e599144c853d2a6212d1e0bb81 (diff) | |
download | pytest-b54943842363c261730b2fce8edbe92d1b9ba84a.tar.gz |
Merge pull request #5058 from blueyed/merge-master-into-features
Merge master into features
Diffstat (limited to 'src/_pytest/skipping.py')
0 files changed, 0 insertions, 0 deletions