summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-05-08 12:07:08 -0700
committerSteve Piercy <web@stevepiercy.com>2016-05-08 12:07:08 -0700
commitc28854062b2092a416fb48a671b07248c47df6b5 (patch)
tree585208aa81b4e1fbae994965ec3a3eb11b364c8e /CONTRIBUTORS.txt
parentd785b7d7e3608848cdb9d21e7b43b524f4251ff3 (diff)
parentd0c1f9ad5e82c265974f5c678c9d4ea459375593 (diff)
downloadpyramid-c28854062b2092a416fb48a671b07248c47df6b5.tar.gz
pyramid-c28854062b2092a416fb48a671b07248c47df6b5.tar.bz2
pyramid-c28854062b2092a416fb48a671b07248c47df6b5.zip
Merge pull request #2550 from Pylons/vincent-ferotin-scaffolds-allow-pytest-run-without-args
Vincent ferotin scaffolds allow pytest run without args
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 563a995a9..55fdf096b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -266,3 +266,5 @@ Contributors
- Marcin Raczyński, 2016/01/26
- Arian Maykon de A. Diógenes, 2016/04/13
+
+- Vincent Férotin, 2016/05/08