diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-04 18:57:45 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-04 18:57:45 -0500 |
| commit | 48c6b0062666a2ed95493790f4f288276b2b06fd (patch) | |
| tree | b4e73842b1e310a2e288ac0e690b1f0a25070132 /docs/copyright.rst | |
| parent | 52a948e65ef923340a9c172fe6d258f2832f8799 (diff) | |
| parent | a21278872884809cfec7d5de8c64518c404f2b02 (diff) | |
| download | pyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.tar.gz pyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.tar.bz2 pyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.zip | |
merge from master
Diffstat (limited to 'docs/copyright.rst')
| -rw-r--r-- | docs/copyright.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst index 9366bdf47..8f3a5f5e7 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -59,7 +59,7 @@ Contributors: Merickel, Eric Ongerth, Niall O'Higgins, Christoph Zwerschke, John Anderson, Atsushi Odagiri, Kirk Strauser, JD Navarro, Joe Dallago, Savoir-Faire Linux, Łukasz Fidosz, Christopher Lambacher, Claus Conrad, - Chris Beelby, Phil Jenvey and a number of people with only psuedonyms on + Chris Beelby, Phil Jenvey and a number of people with only pseudonyms on GitHub. Cover Designer: |