diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
| commit | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch) | |
| tree | 695d4b5e5ae974d0770acfbe9b8231ea1c71288a /CONTRIBUTORS.txt | |
| parent | d35a916095943b020f30acb90e878abe9bfd4fb1 (diff) | |
| parent | 4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff) | |
| download | pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2 pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip | |
Merge branch 'master' into feature.re-entrant-config
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 e4132cda5..adf2224a5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -238,3 +238,5 @@ Contributors - Hugo Branquinho, 2014/11/25 - Adrian Teng, 2014/12/17 + +- Ilja Everila, 2015/02/05 |