diff options
| author | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
| commit | 17279b4da22af5caf23d402b29cef0f729408474 (patch) | |
| tree | 786a5290b1440dea4cc33043cb0715113e0c0451 /CONTRIBUTORS.txt | |
| parent | 50a8a077f403b89ff43ad745f101213c2cfeea8f (diff) | |
| parent | 46805450633291682f97e87055313fc3be477326 (diff) | |
| download | pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.gz pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.bz2 pyramid-17279b4da22af5caf23d402b29cef0f729408474.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts:
pyramid/view.py
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4f9bd6e41..3d574f99d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -244,3 +244,5 @@ Contributors - Geoffrey T. Dairiki, 2015/02/06 - David Glick, 2015/02/12 + +- Donald Stufft, 2015/03/15 |