diff options
| author | Michael Merickel <michael@merickel.org> | 2016-02-29 12:48:09 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-02-29 12:48:09 -0600 |
| commit | a79bac6697fa312cd1ba0ac4e784bbc820c5e603 (patch) | |
| tree | 9f7098358c01622fcae8fbe8a318f6484e5d3c8b /CONTRIBUTORS.txt | |
| parent | 0c185a3f7bd717845b7e5a00bd0d7a267be582b6 (diff) | |
| parent | cb98a90c3dcc40dc42813143a601ef631249f5f4 (diff) | |
| download | pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.gz pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.bz2 pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
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 49b8c11cd..0be18cfe4 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -249,6 +249,8 @@ Contributors - Randy Topliffe, 2015/04/14 +- Timur Izhbulatov, 2015/04/14 + - Karen Dalton, 2015/06/01 - Igor Stroh, 2015/06/10 |