diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-31 02:51:44 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-31 02:51:44 -0500 |
| commit | c26f03e1a920e950976e06c1a7f3b2e5e46c0754 (patch) | |
| tree | deb68628ecf37f74c068528f4a7cb5893eb5269b /CONTRIBUTORS.txt | |
| parent | b26badf557847bf5a55f896c63a3b6a97b468936 (diff) | |
| parent | 4f355b634b32b77c6b35ddc31dfa772f075bf2ee (diff) | |
| download | pyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.tar.gz pyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.tar.bz2 pyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.zip | |
Merge branch 'viewderiver'
Conflicts:
pyramid/config.py
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ab75197e7..7b0364b6d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -117,4 +117,6 @@ Contributors - Casey Duncan, 2010/12/27 +- Rob Miller, 2010/12/28 + - Marius Gedminas, 2010/12/31 |