diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-04 20:02:23 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-04 20:02:23 -0500 |
| commit | f2ef9a3026723cabbfaeffd128d7b7a874f74002 (patch) | |
| tree | ef6d5ee7cbe8e011f9a96dd848cbac2260524596 /docs/copyright.rst | |
| parent | 95df3ac0fc92e882997997dac97b7ba86e19e963 (diff) | |
| parent | 4ded431cba6729e5f2ac1879df735905006555ac (diff) | |
| download | pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.tar.gz pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.tar.bz2 pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.zip | |
Merge branch '1.3-branch' into pathinfogeddon
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: |