diff options
| author | Michael Merickel <michael@merickel.org> | 2012-01-05 03:47:58 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-01-05 03:47:58 -0600 |
| commit | a1751e1a522e331301955c7b540b26d988b51e64 (patch) | |
| tree | 300a7e63c438308eeea92deecf71423e8978877e /docs/copyright.rst | |
| parent | 64497edc64a153815c54b254bf64a46ac21a6ac7 (diff) | |
| parent | 4ded431cba6729e5f2ac1879df735905006555ac (diff) | |
| download | pyramid-a1751e1a522e331301955c7b540b26d988b51e64.tar.gz pyramid-a1751e1a522e331301955c7b540b26d988b51e64.tar.bz2 pyramid-a1751e1a522e331301955c7b540b26d988b51e64.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
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: |