diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-28 10:35:00 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-28 10:35:00 -0500 |
| commit | 8750a7479e439bd6403d26279f9397ab4b938f9a (patch) | |
| tree | 4bf277d023be78b6fcf380efc9ee65f111ece388 | |
| parent | 0377a214e84a5f38838eae4112957a2901475f1a (diff) | |
| parent | e4b3f397374fd2c5a6cf7ca0697e5cf2f77891bf (diff) | |
| download | pyramid-8750a7479e439bd6403d26279f9397ab4b938f9a.tar.gz pyramid-8750a7479e439bd6403d26279f9397ab4b938f9a.tar.bz2 pyramid-8750a7479e439bd6403d26279f9397ab4b938f9a.zip | |
Merge branch 'master' of https://github.com/malthe/pyramid into malthe-master
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index dba39d630..1ef785c3d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -128,3 +128,6 @@ Contributors - Wichert Akkerman, 2011/01/19 - Christopher Lambacehr, 2011/02/12 + +- Malthe Borch, 2011/02/28 + |