diff options
| author | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
| commit | b58909676c28080c320fdb4861b7a49f5728a3aa (patch) | |
| tree | 87d4da217a1609f2229fcda73acdde34e8532944 /CONTRIBUTORS.txt | |
| parent | c0070c95eeb39186c7c2ea0dea6b972c5782f185 (diff) | |
| parent | 8ebde50fdc7322e82b96ad103ab168b92ca2b74a (diff) | |
| download | pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.gz pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.bz2 pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.zip | |
fix merge conflicts after merging master to fix.view-lookup branch; do the merge to see diffs more clearly
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e4132cda5..4f9bd6e41 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -238,3 +238,9 @@ Contributors - Hugo Branquinho, 2014/11/25 - Adrian Teng, 2014/12/17 + +- Ilja Everila, 2015/02/05 + +- Geoffrey T. Dairiki, 2015/02/06 + +- David Glick, 2015/02/12 |