diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-04 01:16:59 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-04 01:16:59 -0500 |
| commit | ef4f39d31a74b875347fd7bd4fbce760915f05ce (patch) | |
| tree | 0b34a0e6fdf0459643a3833e0a3be98447126ef3 /docs/copyright.rst | |
| parent | 61d45f9f3d02f0bdf615a2c266e7f4060c833a3e (diff) | |
| parent | b010d8fc2716f8b08e676957dd4bf9834c369abd (diff) | |
| download | pyramid-ef4f39d31a74b875347fd7bd4fbce760915f05ce.tar.gz pyramid-ef4f39d31a74b875347fd7bd4fbce760915f05ce.tar.bz2 pyramid-ef4f39d31a74b875347fd7bd4fbce760915f05ce.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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: |