diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-31 13:48:13 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-31 13:48:13 -0700 |
| commit | 22642d73056f06a1834dce8970922951fa18c5a1 (patch) | |
| tree | e56037a9d48e7900b5ec3396b1ae28a2723ca623 /CONTRIBUTORS.txt | |
| parent | f4c5f1a60612749ef36aae01d9a3a559b6acdfff (diff) | |
| parent | adfcf6d579496495fb71f8c1af293a953b3a13cb (diff) | |
| download | pyramid-22642d73056f06a1834dce8970922951fa18c5a1.tar.gz pyramid-22642d73056f06a1834dce8970922951fa18c5a1.tar.bz2 pyramid-22642d73056f06a1834dce8970922951fa18c5a1.zip | |
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 40234836e..7b0364b6d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -90,7 +90,7 @@ Licensing Exceptions Code committed within the ``docs/`` subdirectory of the Pyramid source control repository and "docstrings" which appear in the documentation -generated by runnning "make" within this directory is licensed under the +generated by running "make" within this directory is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-nc-sa/3.0/us/). @@ -114,3 +114,9 @@ Contributors - Blaise Laflamme, 2010/11/09 - Chris Rossi, 2010/11/10 + +- Casey Duncan, 2010/12/27 + +- Rob Miller, 2010/12/28 + +- Marius Gedminas, 2010/12/31 |