diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
| commit | 18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch) | |
| tree | ea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /CONTRIBUTORS.txt | |
| parent | bf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff) | |
| parent | d4221720b8409eafb65b301562be327af0196c7e (diff) | |
| download | pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2 pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
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 3d574f99d..cb1117228 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -246,3 +246,9 @@ Contributors - David Glick, 2015/02/12 - Donald Stufft, 2015/03/15 + +- Karen Dalton, 2015/06/01 + +- Igor Stroh, 2015/06/10 + +- Jesse Dhillon, 2015/10/07 |