diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
| commit | 5238bb64abfebc085ca95df517535f61e27b7fc2 (patch) | |
| tree | c4eb14e487f561d4c12824b0b03656e24efccfd1 /CONTRIBUTORS.txt | |
| parent | 0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff) | |
| parent | 530bad618c33d65ad071b0280ce56eb265195805 (diff) | |
| download | pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2 pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7c895ac15..0be18cfe4 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -247,6 +247,10 @@ Contributors - Donald Stufft, 2015/03/15 +- Randy Topliffe, 2015/04/14 + +- Timur Izhbulatov, 2015/04/14 + - Karen Dalton, 2015/06/01 - Igor Stroh, 2015/06/10 |