summaryrefslogtreecommitdiff
path: root/docs/copyright.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-21 23:32:50 -0400
committerChris McDonough <chrism@plope.com>2011-07-21 23:32:50 -0400
commit8c03444dd5d80adaf65e30ebdabf1e6dde644965 (patch)
tree85eddf56ca489fddb9d208179db1b2c77b4640f1 /docs/copyright.rst
parent39e88a1f2903f840feeff77e572c7bf3efebb875 (diff)
downloadpyramid-8c03444dd5d80adaf65e30ebdabf1e6dde644965.tar.gz
pyramid-8c03444dd5d80adaf65e30ebdabf1e6dde644965.tar.bz2
pyramid-8c03444dd5d80adaf65e30ebdabf1e6dde644965.zip
prep for 1.1; gather contributors
Diffstat (limited to 'docs/copyright.rst')
-rw-r--r--docs/copyright.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index 1c7aa5844..4369a7a3f 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -1,7 +1,7 @@
Copyright, Trademarks, and Attributions
=======================================
-*The Pyramid Web Application Development Framework, Version 1.0*
+*The Pyramid Web Application Development Framework, Version 1.1*
by Chris McDonough
@@ -55,7 +55,11 @@ Contributors:
Ben Bangert, Blaise Laflamme, Rob Miller, Mike Orr, Carlos de la Guardia,
Paul Everitt, Tres Seaver, John Shipman, Marius Gedminas, Chris Rossi,
Joachim Krebs, Xavier Spriet, Reed O'Brien, William Chambers, Charlie
- Choiniere, Jamaludin Ahmad, Graham Higgins, Patricio Paez.
+ Choiniere, Jamaludin Ahmad, Graham Higgins, Patricio Paez, Michael
+ 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, and a number of people with only psuedonyms on GitHub.
Cover Designer:
Hugues Laflamme of `Kemeneur <http://www.kemeneur.com/>`_.