diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
| commit | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch) | |
| tree | b8a2cd06ff0130fd31b702862db2e46d39cd4e71 /CONTRIBUTORS.txt | |
| parent | 504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2 pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip | |
Merge branch 'master' 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 cb1117228..1f3597e84 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -252,3 +252,9 @@ Contributors - Igor Stroh, 2015/06/10 - Jesse Dhillon, 2015/10/07 + +- Amos Latteier, 2015/10/22 + +- Rami Chousein, 2015/10/28 + +- Sri Sanketh Uppalapati, 2015/12/12 |