diff options
| author | Michael Merickel <michael@merickel.org> | 2018-11-04 13:25:32 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-11-04 13:25:32 -0600 |
| commit | 44e7e63ac1f95d52bdd25c22c36efd820c059e35 (patch) | |
| tree | e6062558dd3c5a4716f9cd521059f1621bc76457 /CONTRIBUTORS.txt | |
| parent | 6f0d73d6eea8064f1c5d9294beb7f7d64619071d (diff) | |
| parent | de5e4f40e0246d71ba5875c957281fb764da74dd (diff) | |
| download | pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.gz pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.bz2 pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.zip | |
Merge branch 'pr/1639' into bare-route-prefix
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7256b66db..6eb42c18c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -230,6 +230,7 @@ Contributors - Antti Haapala, 2013/11/15 - Amit Mane, 2014/01/23 +<<<<<<< HEAD - Fenton Travers, 2014/05/06 @@ -297,6 +298,8 @@ Contributors - Kirill Kuzminykh, 2017/03/01 +- Charlie Choiniere, 2017/04/03 + - Aleph Melo, 2017/04/16 - Jeremy(Ching-Rui) Chen, 2017/04/19 |