diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-15 19:08:28 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-15 19:08:28 -0500 |
| commit | 2c4cd00d071d53efc560fb38f63d7db4a162e13b (patch) | |
| tree | d9aed9f00f4a11ececd692f71daca9f20b5239fb /CONTRIBUTORS.txt | |
| parent | f2681ae753b9cc94f88b4cf47fa44714ff20216a (diff) | |
| parent | 3d0d55e3f04810f4da83f4b794eb30f605f86d0e (diff) | |
| download | pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.gz pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.bz2 pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ec9042f08..ce8aa75db 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -121,4 +121,6 @@ Contributors - Marius Gedminas, 2010/12/31 -- Marcin Lulek, 2011/01/02
\ No newline at end of file +- Marcin Lulek, 2011/01/02 + +- John Shipman, 2011/01/15 |