diff options
| author | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
| commit | d4333972ad328f06262ba55ef2a3d24963da95b0 (patch) | |
| tree | c208aafc07a03934307019120910c3a576982978 /CONTRIBUTORS.txt | |
| parent | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (diff) | |
| parent | 4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790 (diff) | |
| download | pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.gz pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.bz2 pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.zip | |
fix merge conflicts
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index adf2224a5..4f9bd6e41 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -240,3 +240,7 @@ Contributors - Adrian Teng, 2014/12/17 - Ilja Everila, 2015/02/05 + +- Geoffrey T. Dairiki, 2015/02/06 + +- David Glick, 2015/02/12 |