diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
| commit | b4c96d2892d8271b300b1920e3ce5d2c0eae588b (patch) | |
| tree | 7c0bd810af0d239f0513653eb29eba6e1a08f6a2 /CONTRIBUTORS.txt | |
| parent | e99cd355140258b7cd4cd9c1a83fd3ada1eb2b04 (diff) | |
| parent | 47162533af84bb8d26db6d1c9ba1e63d70e9070f (diff) | |
| download | pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.gz pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.bz2 pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Conflicts:
docs/tutorials/wiki2/basiclayout.rst
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 5191199b7..2ef07af75 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -247,10 +247,10 @@ Contributors - Donald Stufft, 2015/03/15 -- Randy Topliffe, 2015/04/14 - - Karen Dalton, 2015/06/01 - Igor Stroh, 2015/06/10 - Jesse Dhillon, 2015/10/07 + +- Amos Latteier, 2015/10/22 |