diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
| commit | a66e00e9bd51fdffd85fef14e83f12502f2d864e (patch) | |
| tree | 43eb06f24df2818e2db5a947e9866c8076257e91 /CONTRIBUTORS.txt | |
| parent | bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.gz pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.bz2 pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.zip | |
Merge remote-tracking branch 'origin/master' into docs.gettingstarted
Conflicts:
docs/index.rst
docs/latexindex.rst
setup.py
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 61155ca80..0cecc93df 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -200,3 +200,11 @@ Contributors - Jason McKellar, 2013/03/28 - Luke Cyca, 2013/05/30 + +- Laurence Rowe, 2013/04/24 + +- Julian P. Glass, 2013/08/10 + +- Junaid Ali, 2013/08/10 + +- Chris Davies, 2013/08/11 |