summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2019-03-30 14:20:19 -0500
committerGitHub <noreply@github.com>2019-03-30 14:20:19 -0500
commitb85a7c5ed116192966bc88fb9ae0181e8f100b01 (patch)
tree15bbd4d63554a2defd9263bc17f417bd2abb9e42 /CONTRIBUTORS.txt
parent80baff6e61d775dc34bb11b7d6c8ef8569da1c40 (diff)
parentc380d0226fdc5ade67f10dadc1adabdc6e50cb70 (diff)
downloadpyramid-b85a7c5ed116192966bc88fb9ae0181e8f100b01.tar.gz
pyramid-b85a7c5ed116192966bc88fb9ae0181e8f100b01.tar.bz2
pyramid-b85a7c5ed116192966bc88fb9ae0181e8f100b01.zip
Merge pull request #3476 from mmerickel/forward-port-3464-to-master
add ignore_files to pserve configuration section
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 3c92d1d91..96ddcefc7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -337,4 +337,6 @@ Contributors
- Alexandre Yukio Harano, 2018/10/05
+- Eric Atkin, 2019/02/15
+
- Arijit Basu, 2019/02/19