diff options
| author | Michael Merickel <michael@merickel.org> | 2012-08-23 10:18:23 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-08-23 10:18:23 -0500 |
| commit | b8b896b748ba5d4fd9c6d46db0d6f192cab264f3 (patch) | |
| tree | 58bd219db2e546ed1ed882cd5649eda77561412f /CONTRIBUTORS.txt | |
| parent | eb403ffe22501ae0546c02c7c24b54b5e3d1eb83 (diff) | |
| parent | 2cc0710ecf9b47e5a6f41caf6b1c56b29bab2db0 (diff) | |
| download | pyramid-b8b896b748ba5d4fd9c6d46db0d6f192cab264f3.tar.gz pyramid-b8b896b748ba5d4fd9c6d46db0d6f192cab264f3.tar.bz2 pyramid-b8b896b748ba5d4fd9c6d46db0d6f192cab264f3.zip | |
Merge branch 'master' of ianjosephwilson/pyramid into pull.617
Conflicts:
CONTRIBUTORS.txt
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 a2da7fbfd..e44117af3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -177,4 +177,6 @@ Contributors - Jeff Cook, 2012/06/16 +- Ian Wilson, 2012/06/17 + - Roman Kozlovskyi, 2012/08/11 |