diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-11-17 22:42:47 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-11-17 22:42:47 -0700 |
| commit | 42247963d8ddf569e0e73040d90bca7c803323c4 (patch) | |
| tree | cbd3779c5f6cace9cd692b5e32328278794636f5 /docs/copyright.rst | |
| parent | 05354db0c0351a1f1543c9370c6e639d1fe5d1b5 (diff) | |
| parent | 0511437d5250d249accda26ba6435ab737f8c0c5 (diff) | |
| download | pyramid-42247963d8ddf569e0e73040d90bca7c803323c4.tar.gz pyramid-42247963d8ddf569e0e73040d90bca7c803323c4.tar.bz2 pyramid-42247963d8ddf569e0e73040d90bca7c803323c4.zip | |
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/copyright.rst')
| -rw-r--r-- | docs/copyright.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst index 64a0f819b..fa564a785 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -49,7 +49,8 @@ Attributions ------------ Contributors: - Ben Bangert, Blaise Laflamme, Carlos de la Guardia, Paul Everitt + Ben Bangert, Blaise Laflamme, Carlos de la Guardia, Paul Everitt, + Marius Gedminas .. Cover Designer: .. Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_. |