diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2017-03-10 15:54:05 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2017-03-10 15:54:05 -0300 |
| commit | 1e0cf5ce4dcd8b110a45261595d69a502dd0226a (patch) | |
| tree | e5b7993a41db97332a15920f1fa7642ac31750e3 /AUTHORS | |
| parent | 0c94f517a18bc135fe80a07a64c8c74c27b41dcb (diff) | |
| parent | 906b40fbb209916ea13199d5391c2e64b3587103 (diff) | |
| download | pytest-1e0cf5ce4dcd8b110a45261595d69a502dd0226a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/pytester.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -17,6 +17,7 @@ Anthony Sottile Armin Rigo Aron Curzon Aviv Palivoda +Barney Gale Ben Webb Benjamin Peterson Bernard Pratz @@ -43,6 +44,7 @@ Dave Hunt David Díaz-Barquero David Mohr David Vierra +Denis Kirisov Diego Russo Dmitry Dygalo Duncan Betts @@ -117,11 +119,14 @@ Nicolas Delaby Oleg Pidsadnyi Oliver Bestwalter Omar Kohl +Omer Hadari +Patrick Hayes Pieter Mulder Piotr Banaszkiewicz Punyashloka Biswal Quentin Pradet Ralf Schmitt +Ran Benita Raphael Pierzina Raquel Alegre Ravi Chandra @@ -148,5 +153,6 @@ Tyler Goodlet Vasily Kuznetsov Victor Uriarte Vlad Dragos +Vidar T. Fauske Wouter van Ackooy Xuecong Liao |